diff --git a/Microsoft.IIS.Administration.sln b/Microsoft.IIS.Administration.sln
index f251173..97b4b44 100644
--- a/Microsoft.IIS.Administration.sln
+++ b/Microsoft.IIS.Administration.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}"
 EndProject
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
 		scripts\Configure-DevEnvironment.ps1 = scripts\Configure-DevEnvironment.ps1
-		global.json = global.json
 		scripts\publish\publish.ps1 = scripts\publish\publish.ps1
 		README.md = README.md
 		scripts\setup\setup.ps1 = scripts\setup\setup.ps1
@@ -19,75 +18,75 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		scripts\setup\version.json = scripts\setup\version.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration", "src\Microsoft.IIS.Administration\Microsoft.IIS.Administration.xproj", "{9C2ED81D-E4BF-4BF1-A9A0-278654B89313}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration", "src\Microsoft.IIS.Administration\Microsoft.IIS.Administration.csproj", "{9C2ED81D-E4BF-4BF1-A9A0-278654B89313}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer", "src\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.xproj", "{46906A4C-6A49-4D1D-B556-DBBD6F744976}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer", "src\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj", "{46906A4C-6A49-4D1D-B556-DBBD6F744976}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.RequestFiltering", "src\Microsoft.IIS.Administration.WebServer.RequestFiltering\Microsoft.IIS.Administration.WebServer.RequestFiltering.xproj", "{E4C27952-D7E9-4914-8DCE-1F55008E1F6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.RequestFiltering", "src\Microsoft.IIS.Administration.WebServer.RequestFiltering\Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj", "{E4C27952-D7E9-4914-8DCE-1F55008E1F6D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.DefaultDocuments", "src\Microsoft.IIS.Administration.WebServer.DefaultDocuments\Microsoft.IIS.Administration.WebServer.DefaultDocuments.xproj", "{3FA5663A-BA46-4E31-8EB2-BBB57BBF9BDC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.DefaultDocuments", "src\Microsoft.IIS.Administration.WebServer.DefaultDocuments\Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj", "{3FA5663A-BA46-4E31-8EB2-BBB57BBF9BDC}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Compression", "src\Microsoft.IIS.Administration.WebServer.Compression\Microsoft.IIS.Administration.WebServer.Compression.xproj", "{88408DBC-2D46-4152-8EC0-1E9A5CA1B8BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Compression", "src\Microsoft.IIS.Administration.WebServer.Compression\Microsoft.IIS.Administration.WebServer.Compression.csproj", "{88408DBC-2D46-4152-8EC0-1E9A5CA1B8BC}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.Core", "src\Microsoft.IIS.Administration.Core\Microsoft.IIS.Administration.Core.xproj", "{A3ADB83A-C602-4DE4-A8DD-085FE5DD29CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.Core", "src\Microsoft.IIS.Administration.Core\Microsoft.IIS.Administration.Core.csproj", "{A3ADB83A-C602-4DE4-A8DD-085FE5DD29CD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Modules", "src\Microsoft.IIS.Administration.WebServer.Modules\Microsoft.IIS.Administration.WebServer.Modules.xproj", "{7A888725-698A-44CC-B462-7CB50BA74BEB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Modules", "src\Microsoft.IIS.Administration.WebServer.Modules\Microsoft.IIS.Administration.WebServer.Modules.csproj", "{7A888725-698A-44CC-B462-7CB50BA74BEB}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.DirectoryBrowsing", "src\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.xproj", "{973047BF-0432-40FA-8E63-4572BD208254}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.DirectoryBrowsing", "src\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj", "{973047BF-0432-40FA-8E63-4572BD208254}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Logging", "src\Microsoft.IIS.Administration.WebServer.Logging\Microsoft.IIS.Administration.WebServer.Logging.xproj", "{373A43D3-531C-415E-8A06-BB3ADB8B1E0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Logging", "src\Microsoft.IIS.Administration.WebServer.Logging\Microsoft.IIS.Administration.WebServer.Logging.csproj", "{373A43D3-531C-415E-8A06-BB3ADB8B1E0C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.HttpResponseHeaders", "src\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.xproj", "{E48EDD4B-A971-41BF-B99E-F29C3B4265B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.HttpResponseHeaders", "src\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj", "{E48EDD4B-A971-41BF-B99E-F29C3B4265B6}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.StaticContent", "src\Microsoft.IIS.Administration.WebServer.StaticContent\Microsoft.IIS.Administration.WebServer.StaticContent.xproj", "{8C8F1B8A-05B4-4FD3-B072-3BDF8EEA3AAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.StaticContent", "src\Microsoft.IIS.Administration.WebServer.StaticContent\Microsoft.IIS.Administration.WebServer.StaticContent.csproj", "{8C8F1B8A-05B4-4FD3-B072-3BDF8EEA3AAA}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Sites", "src\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.xproj", "{056C022B-19A4-4004-8512-4331EEEB3555}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Sites", "src\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.csproj", "{056C022B-19A4-4004-8512-4331EEEB3555}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.AppPools", "src\Microsoft.IIS.Administration.WebServer.AppPools\Microsoft.IIS.Administration.WebServer.AppPools.xproj", "{7675A545-E9EA-4941-833B-9D213D769A8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.AppPools", "src\Microsoft.IIS.Administration.WebServer.AppPools\Microsoft.IIS.Administration.WebServer.AppPools.csproj", "{7675A545-E9EA-4941-833B-9D213D769A8F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Applications", "src\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.xproj", "{4F45F2E0-D81A-4EF9-BA74-7BEC57516914}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Applications", "src\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj", "{4F45F2E0-D81A-4EF9-BA74-7BEC57516914}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.VirtualDirectories", "src\Microsoft.IIS.Administration.WebServer.VirtualDirectories\Microsoft.IIS.Administration.WebServer.VirtualDirectories.xproj", "{8C6CC5D4-DE7F-488B-BC4C-F7C34CF9BA71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.VirtualDirectories", "src\Microsoft.IIS.Administration.WebServer.VirtualDirectories\Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj", "{8C6CC5D4-DE7F-488B-BC4C-F7C34CF9BA71}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.IPRestrictions", "src\Microsoft.IIS.Administration.WebServer.IPRestrictions\Microsoft.IIS.Administration.WebServer.IPRestrictions.xproj", "{C6DEA80E-89EA-40C1-80A7-035D30454B5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.IPRestrictions", "src\Microsoft.IIS.Administration.WebServer.IPRestrictions\Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj", "{C6DEA80E-89EA-40C1-80A7-035D30454B5C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Delegation", "src\Microsoft.IIS.Administration.WebServer.Delegation\Microsoft.IIS.Administration.WebServer.Delegation.xproj", "{40D9A548-0A74-4BFA-A291-EFFBD3ADE426}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Delegation", "src\Microsoft.IIS.Administration.WebServer.Delegation\Microsoft.IIS.Administration.WebServer.Delegation.csproj", "{40D9A548-0A74-4BFA-A291-EFFBD3ADE426}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Handlers", "src\Microsoft.IIS.Administration.WebServer.Handlers\Microsoft.IIS.Administration.WebServer.Handlers.xproj", "{F2049AF9-0457-405F-8A50-3DEC0CB428BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Handlers", "src\Microsoft.IIS.Administration.WebServer.Handlers\Microsoft.IIS.Administration.WebServer.Handlers.csproj", "{F2049AF9-0457-405F-8A50-3DEC0CB428BE}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Authentication", "src\Microsoft.IIS.Administration.WebServer.Authentication\Microsoft.IIS.Administration.WebServer.Authentication.xproj", "{704450D2-5386-45A2-9475-3A9F585317BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Authentication", "src\Microsoft.IIS.Administration.WebServer.Authentication\Microsoft.IIS.Administration.WebServer.Authentication.csproj", "{704450D2-5386-45A2-9475-3A9F585317BE}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.Certificates", "src\Microsoft.IIS.Administration.Certificates\Microsoft.IIS.Administration.Certificates.xproj", "{3E20985C-5629-41B0-A507-67C0AF024644}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.Certificates", "src\Microsoft.IIS.Administration.Certificates\Microsoft.IIS.Administration.Certificates.csproj", "{3E20985C-5629-41B0-A507-67C0AF024644}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.SslSettings", "src\Microsoft.IIS.Administration.WebServer.SslSettings\Microsoft.IIS.Administration.WebServer.SslSettings.xproj", "{BC861A82-6C97-49D1-9711-D77495AFEB96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.SslSettings", "src\Microsoft.IIS.Administration.WebServer.SslSettings\Microsoft.IIS.Administration.WebServer.SslSettings.csproj", "{BC861A82-6C97-49D1-9711-D77495AFEB96}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.WorkerProcesses", "src\Microsoft.IIS.Administration.WebServer.WorkerProcesses\Microsoft.IIS.Administration.WebServer.WorkerProcesses.xproj", "{0CCE6387-131C-4834-B549-963440F948D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.WorkerProcesses", "src\Microsoft.IIS.Administration.WebServer.WorkerProcesses\Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj", "{0CCE6387-131C-4834-B549-963440F948D2}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Authorization", "src\Microsoft.IIS.Administration.WebServer.Authorization\Microsoft.IIS.Administration.WebServer.Authorization.xproj", "{B82ABB45-60C0-4866-BAD3-0794852D3C66}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Authorization", "src\Microsoft.IIS.Administration.WebServer.Authorization\Microsoft.IIS.Administration.WebServer.Authorization.csproj", "{B82ABB45-60C0-4866-BAD3-0794852D3C66}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.RequestMonitor", "src\Microsoft.IIS.Administration.WebServer.RequestMonitor\Microsoft.IIS.Administration.WebServer.RequestMonitor.xproj", "{BD6EFE51-5B2C-4B29-A745-09CC8A081334}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.RequestMonitor", "src\Microsoft.IIS.Administration.WebServer.RequestMonitor\Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj", "{BD6EFE51-5B2C-4B29-A745-09CC8A081334}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.AccessManagement", "src\Microsoft.IIS.Administration.AccessManagement\Microsoft.IIS.Administration.AccessManagement.xproj", "{AF203E48-EAA7-4486-B5ED-8A5007AC9536}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.AccessManagement", "src\Microsoft.IIS.Administration.AccessManagement\Microsoft.IIS.Administration.AccessManagement.csproj", "{AF203E48-EAA7-4486-B5ED-8A5007AC9536}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Scm", "src\Microsoft.IIS.Administration.WebServer.Scm\Microsoft.IIS.Administration.WebServer.Scm.xproj", "{E38D3DCC-FA34-4EFA-A628-C924093931E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Scm", "src\Microsoft.IIS.Administration.WebServer.Scm\Microsoft.IIS.Administration.WebServer.Scm.csproj", "{E38D3DCC-FA34-4EFA-A628-C924093931E8}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Info", "src\Microsoft.IIS.Administration.WebServer.Info\Microsoft.IIS.Administration.WebServer.Info.xproj", "{463B55E9-768C-462F-88ED-6105F48AF093}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Info", "src\Microsoft.IIS.Administration.WebServer.Info\Microsoft.IIS.Administration.WebServer.Info.csproj", "{463B55E9-768C-462F-88ED-6105F48AF093}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Packager", "src\Packager\Packager.xproj", "{45D76FD8-CD19-4E16-BD42-6BAD177B9B79}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.HttpRequestTracing", "src\Microsoft.IIS.Administration.WebServer.HttpRequestTracing\Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj", "{2B1FDC49-CABC-4A6E-9561-8B04031F6355}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.HttpRequestTracing", "src\Microsoft.IIS.Administration.WebServer.HttpRequestTracing\Microsoft.IIS.Administration.WebServer.HttpRequestTracing.xproj", "{2B1FDC49-CABC-4A6E-9561-8B04031F6355}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.Tests", "test\Microsoft.IIS.Administration.Tests\Microsoft.IIS.Administration.Tests.csproj", "{61B68BC3-B92B-40D4-B8C0-B8C4A8C02ADA}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.Tests", "test\Microsoft.IIS.Administration.Tests\Microsoft.IIS.Administration.Tests.xproj", "{61B68BC3-B92B-40D4-B8C0-B8C4A8C02ADA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.Files", "src\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.csproj", "{5D3BEEB8-5798-4037-8BB0-A35A7A42999A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.Files", "src\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.xproj", "{5D3BEEB8-5798-4037-8BB0-A35A7A42999A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.Files", "src\Microsoft.IIS.Administration.WebServer.Files\Microsoft.IIS.Administration.WebServer.Files.csproj", "{42FDCED0-CE1D-4C16-AED0-0CF6A212F782}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.Files", "src\Microsoft.IIS.Administration.WebServer.Files\Microsoft.IIS.Administration.WebServer.Files.xproj", "{42FDCED0-CE1D-4C16-AED0-0CF6A212F782}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.Files.Core", "src\Microsoft.IIS.Administration.Files.Core\Microsoft.IIS.Administration.Files.Core.csproj", "{60F7757A-14AE-41BE-9FD0-ED4C63718408}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.Files.Core", "src\Microsoft.IIS.Administration.Files.Core\Microsoft.IIS.Administration.Files.Core.xproj", "{60F7757A-14AE-41BE-9FD0-ED4C63718408}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.HttpRedirect", "src\Microsoft.IIS.Administration.WebServer.HttpRedirect\Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj", "{1BF40243-71BD-487F-9FD9-50959D100536}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.HttpRedirect", "src\Microsoft.IIS.Administration.WebServer.HttpRedirect\Microsoft.IIS.Administration.WebServer.HttpRedirect.xproj", "{1BF40243-71BD-487F-9FD9-50959D100536}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IIS.Administration.WebServer.CentralCertificates", "src\Microsoft.IIS.Administration.WebServer.CentralCertificates\Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj", "{408A6FF5-966E-4989-8D66-41146A78A367}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.IIS.Administration.WebServer.CentralCertificates", "src\Microsoft.IIS.Administration.WebServer.CentralCertificates\Microsoft.IIS.Administration.WebServer.CentralCertificates.xproj", "{408A6FF5-966E-4989-8D66-41146A78A367}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Packager", "src\Packager\Packager\Packager.csproj", "{BA51ADAF-9335-471B-8786-0470CE358F93}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -203,10 +202,6 @@ Global
 		{463B55E9-768C-462F-88ED-6105F48AF093}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{463B55E9-768C-462F-88ED-6105F48AF093}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{463B55E9-768C-462F-88ED-6105F48AF093}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45D76FD8-CD19-4E16-BD42-6BAD177B9B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45D76FD8-CD19-4E16-BD42-6BAD177B9B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45D76FD8-CD19-4E16-BD42-6BAD177B9B79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45D76FD8-CD19-4E16-BD42-6BAD177B9B79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2B1FDC49-CABC-4A6E-9561-8B04031F6355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B1FDC49-CABC-4A6E-9561-8B04031F6355}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2B1FDC49-CABC-4A6E-9561-8B04031F6355}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -235,6 +230,10 @@ Global
 		{408A6FF5-966E-4989-8D66-41146A78A367}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{408A6FF5-966E-4989-8D66-41146A78A367}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{408A6FF5-966E-4989-8D66-41146A78A367}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA51ADAF-9335-471B-8786-0470CE358F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA51ADAF-9335-471B-8786-0470CE358F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA51ADAF-9335-471B-8786-0470CE358F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA51ADAF-9335-471B-8786-0470CE358F93}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -267,7 +266,6 @@ Global
 		{AF203E48-EAA7-4486-B5ED-8A5007AC9536} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{E38D3DCC-FA34-4EFA-A628-C924093931E8} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{463B55E9-768C-462F-88ED-6105F48AF093} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
-		{45D76FD8-CD19-4E16-BD42-6BAD177B9B79} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{2B1FDC49-CABC-4A6E-9561-8B04031F6355} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{61B68BC3-B92B-40D4-B8C0-B8C4A8C02ADA} = {5504DA5E-BCF3-409E-A285-E59EDBBBB8B8}
 		{5D3BEEB8-5798-4037-8BB0-A35A7A42999A} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
@@ -275,5 +273,6 @@ Global
 		{60F7757A-14AE-41BE-9FD0-ED4C63718408} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{1BF40243-71BD-487F-9FD9-50959D100536} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 		{408A6FF5-966E-4989-8D66-41146A78A367} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
+		{BA51ADAF-9335-471B-8786-0470CE358F93} = {BC25CF2F-4139-4D3F-9DC5-279FD380D0F2}
 	EndGlobalSection
 EndGlobal
diff --git a/global.json b/global.json
deleted file mode 100644
index a5c9aa6..0000000
--- a/global.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "projects": [
-    "src",
-    "test"
-  ],
-
-  "sdk": {
-    "version": "1.0.0-preview2-003131",
-    "runtime": "coreclr",
-    "architecture": "x64"
-  }
-}
\ No newline at end of file
diff --git a/scripts/publish/applicationHost.config b/scripts/publish/applicationHost.config
deleted file mode 100644
index 660bf8d..0000000
--- a/scripts/publish/applicationHost.config
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <sectionGroup name="system.applicationHost">
-      <section name="applicationPools" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="configHistory" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="customMetadata" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="listenerAdapters" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="log" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="serviceAutoStartProviders" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="sites" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-    </sectionGroup>
-    <sectionGroup name="system.webServer">
-      <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
-      <section name="modules" />
-      <section name="caching" overrideModeDefault="Allow" />
-      <section name="handlers" overrideModeDefault="Allow" />
-      <section name="staticContent" />
-      <section name="serverRuntime" />
-      <section name="httpProtocol" overrideModeDefault="Allow" />
-      <sectionGroup name="security">
-        <section name="access" />
-        <sectionGroup name="authentication">
-          <section name="anonymousAuthentication" overrideModeDefault="Allow" />
-          <section name="windowsAuthentication" overrideModeDefault="Allow" />
-        </sectionGroup>
-        <section name="authorization" overrideModeDefault="Allow" />
-      </sectionGroup>
-      <section name="aspNetCore" overrideModeDefault="Allow" />
-    </sectionGroup>
-  </configSections>
-  <system.applicationHost>
-    <applicationPools>
-      <add name="IISAdminAppPool" managedRuntimeVersion="" managedPipelineMode="Integrated" />
-    </applicationPools>
-    <sites>
-      <site name="IISAdmin" id="1">
-        <bindings>
-          <binding protocol="https" bindingInformation="*:55539:" />
-        </bindings>
-        <application path="/" applicationPool="IISAdminAppPool">
-          <virtualDirectory path="/" physicalPath="{Microsoft.IIS.Administration PHYSICAL_PATH}" />
-        </application>
-      </site>
-    </sites>
-  </system.applicationHost>
-  <system.webServer>
-    <globalModules>
-      <add name="UriCacheModule" image="%windir%\System32\inetsrv\cachuri.dll" />
-      <add name="FileCacheModule" image="%windir%\System32\inetsrv\cachfile.dll" />
-      <add name="TokenCacheModule" image="%windir%\System32\inetsrv\cachtokn.dll" />
-      <add name="HttpCacheModule" image="%windir%\System32\inetsrv\cachhttp.dll" />
-      <add name="ProtocolSupportModule" image="%windir%\System32\inetsrv\protsup.dll" />
-      <add name="StaticFileModule" image="%windir%\System32\inetsrv\static.dll" />
-      <add name="AnonymousAuthenticationModule" image="%windir%\System32\inetsrv\authanon.dll" />
-      <add name="WindowsAuthenticationModule" image="%windir%\System32\inetsrv\authsspi.dll" />
-      <add name="UrlAuthorizationModule" image="%windir%\System32\inetsrv\urlauthz.dll" />
-      <add name="AspNetCoreModule" image="%windir%\System32\inetsrv\aspnetcore.dll" />
-    </globalModules>
-    <modules>
-      <add name="HttpCacheModule" />
-      <add name="ProtocolSupportModule" />
-      <add name="StaticFileModule" />
-      <add name="AnonymousAuthenticationModule" />
-      <add name="WindowsAuthenticationModule" />
-      <add name="UrlAuthorizationModule" />
-      <add name="AspNetCoreModule" />
-    </modules>
-    <handlers accessPolicy="Read, Script">
-      <add name="StaticFile" path="*" verb="GET,HEAD" modules="StaticFileModule" resourceType="Either" requireAccess="Read" />
-    </handlers>
-    <aspNetCore>
-      <recycleOnFileChange />
-      <environmentVariables />
-    </aspNetCore>
-    <security>
-      <authentication>
-        <anonymousAuthentication enabled="false" userName="IUSR" />
-        <windowsAuthentication enabled="false" authPersistNonNTLM="true">
-          <providers>
-            <add value="Negotiate" />
-            <add value="NTLM" />
-          </providers>
-        </windowsAuthentication>
-      </authentication>
-    </security>
-    <staticContent>
-      <mimeMap fileExtension=".js" mimeType="application/javascript" />
-      <mimeMap fileExtension=".css" mimeType="text/css" />
-    </staticContent>
-    <httpProtocol>
-      <customHeaders>
-        <add name="X-Frame-Options" value="SAMEORIGIN" />
-      </customHeaders>
-    </httpProtocol>
-  </system.webServer>
-  <location path="IISAdmin/api">
-    <system.webServer>
-      <httpProtocol>
-        <customHeaders>
-          <remove name="X-Frame-Options" />
-        </customHeaders>
-      </httpProtocol>
-    </system.webServer>
-  </location>
-</configuration>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.AccessManagement/Controllers/AccessTokensController.cs b/src/Microsoft.IIS.Administration.AccessManagement/Controllers/AccessTokensController.cs
index 9430f53..46ae252 100644
--- a/src/Microsoft.IIS.Administration.AccessManagement/Controllers/AccessTokensController.cs
+++ b/src/Microsoft.IIS.Administration.AccessManagement/Controllers/AccessTokensController.cs
@@ -4,7 +4,6 @@
 
 namespace Microsoft.IIS.Administration.AccessManagement {
     using System;
-    using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
     using System.Web.Http;
@@ -24,7 +23,7 @@ namespace Microsoft.IIS.Administration.AccessManagement {
     //  CORs MUST be explicitly disabled
     //  AntiForgery MUST be applied
     /// </summary>
-    [Authorize]
+    [Authorize(Policy = "ApiKeys")]
     [DisableCors]
     public class AccessTokensController : ApiController {
         IApiKeyProvider _keyProvider;
@@ -62,7 +61,7 @@ namespace Microsoft.IIS.Administration.AccessManagement {
         }
 
 
-        //[ValidateAntiForgeryToken]
+        [ValidateAntiForgeryToken]
         [HttpPost]
         [ResourceInfo(Name = Defines.AccessTokenName)]
         public async Task<object> Post([FromBody] dynamic model) {
diff --git a/src/Microsoft.IIS.Administration.AccessManagement/Controllers/ApiKeysController.cs b/src/Microsoft.IIS.Administration.AccessManagement/Controllers/ApiKeysController.cs
index bc58e26..62e495f 100644
--- a/src/Microsoft.IIS.Administration.AccessManagement/Controllers/ApiKeysController.cs
+++ b/src/Microsoft.IIS.Administration.AccessManagement/Controllers/ApiKeysController.cs
@@ -26,7 +26,7 @@ namespace Microsoft.IIS.Administration.AccessManagement {
     //  CORs MUST be explicitly disabled
     //  AntiForgery MUST be applied
     /// </summary>
-    [Authorize]
+    [Authorize(Policy = "ApiKeys")]
     [DisableCors]
     public class ApiKeysController : ApiBaseController {
         IApiKeyProvider _keyProvider;
diff --git a/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.csproj b/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.csproj
new file mode 100644
index 0000000..1657750
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.AccessManagement</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.AccessManagement</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.AccessManagement</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Core\Microsoft.IIS.Administration.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.xproj b/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.xproj
deleted file mode 100644
index 718dd68..0000000
--- a/src/Microsoft.IIS.Administration.AccessManagement/Microsoft.IIS.Administration.AccessManagement.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>af203e48-eaa7-4486-b5ed-8a5007ac9536</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.AccessManagement</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.AccessManagement/project.json b/src/Microsoft.IIS.Administration.AccessManagement/project.json
deleted file mode 100644
index 45cf5ac..0000000
--- a/src/Microsoft.IIS.Administration.AccessManagement/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.AccessManagement",
-  "authors": [ "Microsoft" ],
-
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.Core": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.csproj b/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.csproj
new file mode 100644
index 0000000..0bef307
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.Certificates Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.Certificates</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.Certificates</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.xproj b/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.xproj
deleted file mode 100644
index 85ae24d..0000000
--- a/src/Microsoft.IIS.Administration.Certificates/Microsoft.IIS.Administration.Certificates.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>3e20985c-5629-41b0-a507-67c0af024644</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.Certificates</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.Certificates/project.json b/src/Microsoft.IIS.Administration.Certificates/project.json
deleted file mode 100644
index f30f9ba..0000000
--- a/src/Microsoft.IIS.Administration.Certificates/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.Certificates Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.Files": "1.1.0",
-    "System.Security.Cryptography.X509Certificates": "4.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.Core/Http/ApiBaseController.cs b/src/Microsoft.IIS.Administration.Core/Http/ApiBaseController.cs
index 633aa73..d58a23b 100644
--- a/src/Microsoft.IIS.Administration.Core/Http/ApiBaseController.cs
+++ b/src/Microsoft.IIS.Administration.Core/Http/ApiBaseController.cs
@@ -10,7 +10,8 @@ namespace Microsoft.IIS.Administration.Core.Http {
     using AspNetCore.Mvc;
     using Utils;
 
-    [Authorize]
+
+    [Authorize(Policy ="Api")]
     public abstract class ApiBaseController : ApiController {
         
         [HttpGet]
diff --git a/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.csproj b/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.csproj
new file mode 100644
index 0000000..c6d0f6a
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.Core Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.Core</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.Core</PackageId>
+    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="1.0.0" />
+    <PackageReference Include="Serilog" Version="2.3.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="1.0.3" />
+    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.xproj b/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.xproj
deleted file mode 100644
index f724bfd..0000000
--- a/src/Microsoft.IIS.Administration.Core/Microsoft.IIS.Administration.Core.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a3adb83a-c602-4de4-a8dd-085fe5dd29cd</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.Core</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.Core/Security/AccessToken.cs b/src/Microsoft.IIS.Administration.Core/Security/ClaimTypes.cs
similarity index 100%
rename from src/Microsoft.IIS.Administration.Core/Security/AccessToken.cs
rename to src/Microsoft.IIS.Administration.Core/Security/ClaimTypes.cs
diff --git a/src/Microsoft.IIS.Administration.Core/project.json b/src/Microsoft.IIS.Administration.Core/project.json
deleted file mode 100644
index f47ad63..0000000
--- a/src/Microsoft.IIS.Administration.Core/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.Core Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Serilog.Extensions.Logging": "1.0.0",
-    "Serilog": "2.0.0",
-    "Serilog.Sinks.RollingFile": "2.1.0",
-    "Microsoft.AspNetCore.Mvc": "1.0.1",
-    "Microsoft.AspNetCore.Authorization": "1.0.0",
-    "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1",
-    "System.Diagnostics.FileVersionInfo": "4.0.0",
-    "Microsoft.Extensions.Configuration.Binder": "1.0.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.csproj b/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.csproj
new file mode 100644
index 0000000..5dad659
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.Files.Core Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.Files.Core</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.Files.Core</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Core\Microsoft.IIS.Administration.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.xproj b/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.xproj
deleted file mode 100644
index 811ec3b..0000000
--- a/src/Microsoft.IIS.Administration.Files.Core/Microsoft.IIS.Administration.Files.Core.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>60f7757a-14ae-41be-9fd0-ed4c63718408</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.Files.Core</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.IIS.Administration.Files.Core/project.json b/src/Microsoft.IIS.Administration.Files.Core/project.json
deleted file mode 100644
index e8bc613..0000000
--- a/src/Microsoft.IIS.Administration.Files.Core/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.Files.Core Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.Core": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.csproj b/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.csproj
new file mode 100644
index 0000000..89cfea0
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.Files Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.Files</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.Files</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Files.Core\Microsoft.IIS.Administration.Files.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.xproj b/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.xproj
deleted file mode 100644
index 4b7544a..0000000
--- a/src/Microsoft.IIS.Administration.Files/Microsoft.IIS.Administration.Files.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>5d3beeb8-5798-4037-8bb0-a35a7a42999a</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.Files</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.Files/project.json b/src/Microsoft.IIS.Administration.Files/project.json
deleted file mode 100644
index b3a02ce..0000000
--- a/src/Microsoft.IIS.Administration.Files/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.Files Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
-    "Microsoft.IIS.Administration.Files.Core": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.AppPools/Controllers/AppPoolsController.cs b/src/Microsoft.IIS.Administration.WebServer.AppPools/Controllers/AppPoolsController.cs
index 944da52..a3e664d 100644
--- a/src/Microsoft.IIS.Administration.WebServer.AppPools/Controllers/AppPoolsController.cs
+++ b/src/Microsoft.IIS.Administration.WebServer.AppPools/Controllers/AppPoolsController.cs
@@ -14,9 +14,17 @@ namespace Microsoft.IIS.Administration.WebServer.AppPools
     using Web.Administration;
     using Core.Http;
     using System;
+    using Microsoft.AspNetCore.Authorization;
+    using System.Threading.Tasks;
+    using System.Security.Claims;
 
     public class AppPoolsController : ApiBaseController {
         private const string HIDDEN_FIELDS = "model.identity.password";
+        private IAuthorizationService _authorization;
+
+        public AppPoolsController(IAuthorizationService svc) {
+            _authorization = svc;
+        }
 
         [HttpGet]
         [ResourceInfo(Name = Defines.AppPoolsName)]
@@ -54,12 +62,14 @@ namespace Microsoft.IIS.Administration.WebServer.AppPools
         [HttpPost]
         [Audit(AuditAttribute.ALL, HIDDEN_FIELDS)]
         [ResourceInfo(Name = Defines.AppPoolName)]
-        public object Post([FromBody]dynamic model)
+        public async Task<object> Post([FromBody]dynamic model)
         {
             // Create AppPool
             ApplicationPool pool = AppPoolHelper.CreateAppPool(model);
 
-            EnsureAppPoolIdentityAllowed(pool);
+            if (!await IsAppPoolIdentityAllowed(pool)) {
+                return null;
+            }
 
             // Save it
             ManagementUnit.ServerManager.ApplicationPools.Add(pool);
@@ -100,7 +110,7 @@ namespace Microsoft.IIS.Administration.WebServer.AppPools
         [HttpPatch]
         [Audit(AuditAttribute.ALL, HIDDEN_FIELDS)]
         [ResourceInfo(Name = Defines.AppPoolName)]
-        public object Patch(string id, [FromBody] dynamic model)
+        public async Task<object> Patch(string id, [FromBody] dynamic model)
         {
             // Cut off the notion of uuid from beginning of request
             string name = AppPoolId.CreateFromUuid(id).Name;
@@ -111,8 +121,8 @@ namespace Microsoft.IIS.Administration.WebServer.AppPools
                 return NotFound();
             }
 
-            if (model.identity != null) {
-                EnsureAppPoolIdentityAllowed(appPool);
+            if (model.identity != null && !await IsAppPoolIdentityAllowed(appPool)) {
+                return new ForbidResult();
             }
 
             // Start/Stop
@@ -172,17 +182,12 @@ namespace Microsoft.IIS.Administration.WebServer.AppPools
             return Status.Unknown;
         }
 
-        private void EnsureAppPoolIdentityAllowed(ApplicationPool pool) {
+        private async Task<bool> IsAppPoolIdentityAllowed(ApplicationPool pool) {
             if (pool.ProcessModel.IdentityType != ProcessModelIdentityType.LocalSystem) {
-                return;
+                return true;
             }
 
-            //
-            // Only admins can set up LocalSystem AppPool identity
-
-            if (!User.IsInRole("Administrators")) {
-                throw new UnauthorizedArgumentException("identity.identity_type");
-            }
+            return await _authorization.AuthorizeAsync(Context.User, null, "system");
         }
     }
 }
diff --git a/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.csproj b/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.csproj
new file mode 100644
index 0000000..d4b9fb6
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.AppPools Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.AppPools</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.AppPools</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.xproj b/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.xproj
deleted file mode 100644
index c956115..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.AppPools/Microsoft.IIS.Administration.WebServer.AppPools.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>7675a545-e9ea-4941-833b-9d213d769a8f</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.AppPools</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.AppPools/project.json b/src/Microsoft.IIS.Administration.WebServer.AppPools/project.json
deleted file mode 100644
index 438a4b8..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.AppPools/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.AppPools Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.csproj b/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.csproj
new file mode 100644
index 0000000..b1e7518
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Application Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Applications</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Applications</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.xproj b/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.xproj
deleted file mode 100644
index 9ea50a6..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Applications/Microsoft.IIS.Administration.WebServer.Applications.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>4f45f2e0-d81a-4ef9-ba74-7bec57516914</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Applications</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Applications/project.json b/src/Microsoft.IIS.Administration.WebServer.Applications/project.json
deleted file mode 100644
index 229db9c..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Applications/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Application Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Sites": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.csproj b/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.csproj
new file mode 100644
index 0000000..c550b4f
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.Authentication Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Authentication</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Authentication</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.xproj b/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.xproj
deleted file mode 100644
index d4d87c8..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Authentication/Microsoft.IIS.Administration.WebServer.Authentication.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>704450d2-5386-45a2-9475-3a9f585317be</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Authentication</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authentication/project.json b/src/Microsoft.IIS.Administration.WebServer.Authentication/project.json
deleted file mode 100644
index 6341ce5..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Authentication/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.Authentication Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.csproj b/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.csproj
new file mode 100644
index 0000000..1a18a0c
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Authorization Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Authorization</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Authorization</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.xproj b/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.xproj
deleted file mode 100644
index 3568cd2..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Authorization/Microsoft.IIS.Administration.WebServer.Authorization.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b82abb45-60c0-4866-bad3-0794852d3c66</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Authorization</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Authorization/project.json b/src/Microsoft.IIS.Administration.WebServer.Authorization/project.json
deleted file mode 100644
index a80cdb7..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Authorization/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Authorization Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj b/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj
new file mode 100644
index 0000000..a89cd03
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.CentralCertificates Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.CentralCertificates</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.CentralCertificates</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Certificates\Microsoft.IIS.Administration.Certificates.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Security.Cryptography.Csp" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.xproj b/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.xproj
deleted file mode 100644
index f670372..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/Microsoft.IIS.Administration.WebServer.CentralCertificates.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>408a6ff5-966e-4989-8d66-41146a78a367</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.CentralCertificates</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/project.json b/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/project.json
deleted file mode 100644
index f1b10d1..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.CentralCertificates/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.CentralCertificates Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.Certificates": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer": "1.1.0",
-    "System.Security.Cryptography.Csp": "4.0.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.csproj b/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.csproj
new file mode 100644
index 0000000..7037c75
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Compression Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Compression</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Compression</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.xproj b/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.xproj
deleted file mode 100644
index 3f0729a..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Compression/Microsoft.IIS.Administration.WebServer.Compression.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>88408dbc-2d46-4152-8ec0-1e9a5ca1b8bc</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Compression</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Compression/project.json b/src/Microsoft.IIS.Administration.WebServer.Compression/project.json
deleted file mode 100644
index c5260e2..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Compression/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Compression Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj b/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj
new file mode 100644
index 0000000..c2efe09
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.DefaultDocument Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.DefaultDocuments</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.DefaultDocuments</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.xproj b/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.xproj
deleted file mode 100644
index 6849d02..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/Microsoft.IIS.Administration.WebServer.DefaultDocuments.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>3fa5663a-ba46-4e31-8eb2-bbb57bbf9bdc</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.DefaultDocuments</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/project.json b/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/project.json
deleted file mode 100644
index c03931d..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.DefaultDocuments/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.DefaultDocument Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.csproj b/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.csproj
new file mode 100644
index 0000000..5584970
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Delegation Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Delegation</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Delegation</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.xproj b/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.xproj
deleted file mode 100644
index 97036e5..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Delegation/Microsoft.IIS.Administration.WebServer.Delegation.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>40d9a548-0a74-4bfa-a291-effbd3ade426</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Delegation</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Delegation/project.json b/src/Microsoft.IIS.Administration.WebServer.Delegation/project.json
deleted file mode 100644
index 1732153..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Delegation/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Delegation Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj b/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj
new file mode 100644
index 0000000..b0a6eb2
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.DirectoryBrowsing Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.DirectoryBrowsing</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.DirectoryBrowsing</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.xproj b/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.xproj
deleted file mode 100644
index 6f82e11..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>973047bf-0432-40fa-8e63-4572bd208254</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.DirectoryBrowsing</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/project.json b/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/project.json
deleted file mode 100644
index c0fa307..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.DirectoryBrowsing/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.DirectoryBrowsing Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.csproj b/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.csproj
new file mode 100644
index 0000000..1c99349
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Files Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Files</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Files</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.VirtualDirectories\Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.xproj b/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.xproj
deleted file mode 100644
index b06af71..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Files/Microsoft.IIS.Administration.WebServer.Files.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>42fdced0-ce1d-4c16-aed0-0cf6a212f782</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Files</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Files/project.json b/src/Microsoft.IIS.Administration.WebServer.Files/project.json
deleted file mode 100644
index e8cd7d2..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Files/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Files Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
-    "Microsoft.IIS.Administration.Files": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.VirtualDirectories": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.csproj b/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.csproj
new file mode 100644
index 0000000..cb0aca5
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Handlers Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Handlers</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Handlers</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.xproj b/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.xproj
deleted file mode 100644
index a4caebc..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Handlers/Microsoft.IIS.Administration.WebServer.Handlers.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f2049af9-0457-405f-8a50-3dec0cb428be</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Handlers</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Handlers/project.json b/src/Microsoft.IIS.Administration.WebServer.Handlers/project.json
deleted file mode 100644
index f4e9d91..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Handlers/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Handlers Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj b/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj
new file mode 100644
index 0000000..79b4ffb
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.HttpRedirect Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.HttpRedirect</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.HttpRedirect</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.xproj b/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.xproj
deleted file mode 100644
index 5b36bee..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/Microsoft.IIS.Administration.WebServer.HttpRedirect.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>1bf40243-71bd-487f-9fd9-50959d100536</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.HttpRedirect</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/project.json b/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/project.json
deleted file mode 100644
index 60d8554..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpRedirect/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.HttpRedirect Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj b/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj
new file mode 100644
index 0000000..1b73e65
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.HttpRequestTracing Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.HttpRequestTracing</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.HttpRequestTracing</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.xproj b/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.xproj
deleted file mode 100644
index 17cf482..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/Microsoft.IIS.Administration.WebServer.HttpRequestTracing.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>2b1fdc49-cabc-4a6e-9561-8b04031f6355</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.HttpRequestTracing</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/project.json b/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/project.json
deleted file mode 100644
index 114f54f..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpRequestTracing/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.HttpRequestTracing Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj b/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj
new file mode 100644
index 0000000..6f2fa2e
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.HTTPResponseHeaders Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.HttpResponseHeaders</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.HttpResponseHeaders</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.xproj b/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.xproj
deleted file mode 100644
index bc110fa..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e48edd4b-a971-41bf-b99e-f29c3b4265b6</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.HTTPResponseHeaders</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/project.json b/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/project.json
deleted file mode 100644
index 6a72222..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.HttpResponseHeaders/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.HTTPResponseHeaders Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj b/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj
new file mode 100644
index 0000000..1376d77
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.IPRestrictions Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.IPRestrictions</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.IPRestrictions</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.xproj b/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.xproj
deleted file mode 100644
index 276ca65..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/Microsoft.IIS.Administration.WebServer.IPRestrictions.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>c6dea80e-89ea-40c1-80a7-035d30454b5c</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.IPRestrictions</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/project.json b/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/project.json
deleted file mode 100644
index 200ac48..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.IPRestrictions/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.IPRestrictions Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0",
-    "System.Collections.NonGeneric": "4.0.1"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.csproj b/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.csproj
new file mode 100644
index 0000000..7759d25
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Info Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Info</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Info</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.xproj b/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.xproj
deleted file mode 100644
index fb8b2e3..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Info/Microsoft.IIS.Administration.WebServer.Info.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>463b55e9-768c-462f-88ed-6105f48af093</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Info</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Info/project.json b/src/Microsoft.IIS.Administration.WebServer.Info/project.json
deleted file mode 100644
index e077846..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Info/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Info Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer": "1.1.0",
-    "System.Diagnostics.FileVersionInfo": "4.0.0",
-    "System.ServiceProcess.ServiceController": "4.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.csproj b/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.csproj
new file mode 100644
index 0000000..9e6f989
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Logging Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Logging</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Logging</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.xproj b/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.xproj
deleted file mode 100644
index 252de3c..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Logging/Microsoft.IIS.Administration.WebServer.Logging.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>373a43d3-531c-415e-8a06-bb3adb8b1e0c</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Logging</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Logging/project.json b/src/Microsoft.IIS.Administration.WebServer.Logging/project.json
deleted file mode 100644
index 32ae878..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Logging/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Logging Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Sites": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.csproj b/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.csproj
new file mode 100644
index 0000000..38c5dc8
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Modules Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Modules</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Modules</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.xproj b/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.xproj
deleted file mode 100644
index 21835eb..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Modules/Microsoft.IIS.Administration.WebServer.Modules.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>7a888725-698a-44cc-b462-7cb50ba74beb</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Modules</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Modules/project.json b/src/Microsoft.IIS.Administration.WebServer.Modules/project.json
deleted file mode 100644
index f6370c4..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Modules/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Modules Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj b/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj
new file mode 100644
index 0000000..7dd4cdf
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.RequestFiltering Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.RequestFiltering</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.RequestFiltering</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.xproj b/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.xproj
deleted file mode 100644
index 6ff27ed..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/Microsoft.IIS.Administration.WebServer.RequestFiltering.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e4c27952-d7e9-4914-8dce-1f55008e1f6d</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.RequestFiltering</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/project.json b/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/project.json
deleted file mode 100644
index 78c7bf5..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.RequestFiltering/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.RequestFiltering Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj b/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj
new file mode 100644
index 0000000..c7f222f
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.RequestMonitor Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.RequestMonitor</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.RequestMonitor</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.WorkerProcesses\Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.xproj b/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.xproj
deleted file mode 100644
index 532c264..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/Microsoft.IIS.Administration.WebServer.RequestMonitor.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>bd6efe51-5b2c-4b29-a745-09cc8a081334</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.RequestMonitor</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/project.json b/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/project.json
deleted file mode 100644
index da2ff07..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.RequestMonitor/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.RequestMonitor Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.WorkerProcesses": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Sites": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.csproj b/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.csproj
new file mode 100644
index 0000000..56a299b
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Scm Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Scm</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Scm</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.xproj b/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.xproj
deleted file mode 100644
index 3b2cf23..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Scm/Microsoft.IIS.Administration.WebServer.Scm.xproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e38d3dcc-fa34-4efa-a628-c924093931e8</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Scm</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Scm/project.json b/src/Microsoft.IIS.Administration.WebServer.Scm/project.json
deleted file mode 100644
index b6f2304..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Scm/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Scm Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer": "1.1.0",
-    "System.ServiceProcess.ServiceController": "4.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.csproj b/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.csproj
new file mode 100644
index 0000000..67784a8
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.Sites Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.Sites</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.Sites</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.AppPools\Microsoft.IIS.Administration.WebServer.AppPools.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.CentralCertificates\Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.xproj b/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.xproj
deleted file mode 100644
index 89eb5d1..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Sites/Microsoft.IIS.Administration.WebServer.Sites.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>056c022b-19a4-4004-8512-4331eeeb3555</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.Sites</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.Sites/project.json b/src/Microsoft.IIS.Administration.WebServer.Sites/project.json
deleted file mode 100644
index c66322c..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.Sites/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.Sites Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.Files": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.AppPools": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.CentralCertificates": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.csproj b/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.csproj
new file mode 100644
index 0000000..06e90f4
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.SslSettings Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.SslSettings</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.SslSettings</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.xproj b/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.xproj
deleted file mode 100644
index ae7a292..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.SslSettings/Microsoft.IIS.Administration.WebServer.SslSettings.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>bc861a82-6c97-49d1-9711-d77495afeb96</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.SslSettings</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.SslSettings/project.json b/src/Microsoft.IIS.Administration.WebServer.SslSettings/project.json
deleted file mode 100644
index a3b6998..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.SslSettings/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.SslSettings Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.csproj b/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.csproj
new file mode 100644
index 0000000..9183584
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.MimeTypes Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.StaticContent</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.StaticContent</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.xproj b/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.xproj
deleted file mode 100644
index f07fd76..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.StaticContent/Microsoft.IIS.Administration.WebServer.StaticContent.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>8c8f1b8a-05b4-4fd3-b072-3bdf8eea3aaa</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.StaticContent</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.StaticContent/project.json b/src/Microsoft.IIS.Administration.WebServer.StaticContent/project.json
deleted file mode 100644
index d33929c..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.StaticContent/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.MimeTypes Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj b/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj
new file mode 100644
index 0000000..54077ef
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.VirtualDirectory Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.VirtualDirectories</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.VirtualDirectories</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.xproj b/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.xproj
deleted file mode 100644
index c55b083..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/Microsoft.IIS.Administration.WebServer.VirtualDirectories.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>8c6cc5d4-de7f-488b-bc4c-f7c34cf9ba71</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.VirtualDirectory</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/project.json b/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/project.json
deleted file mode 100644
index 87b0b72..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.VirtualDirectories/project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.VirtualDirectory Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj b/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj
new file mode 100644
index 0000000..95323ba
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer.WorkerProcesses Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer.WorkerProcesses</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer.WorkerProcesses</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.WebServer.AppPools\Microsoft.IIS.Administration.WebServer.AppPools.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.xproj b/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.xproj
deleted file mode 100644
index cf690a1..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/Microsoft.IIS.Administration.WebServer.WorkerProcesses.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>0cce6387-131c-4834-b549-963440f948d2</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer.WorkerProcesses</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/project.json b/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/project.json
deleted file mode 100644
index 4182ace..0000000
--- a/src/Microsoft.IIS.Administration.WebServer.WorkerProcesses/project.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer.WorkerProcesses Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.WebServer.AppPools": "1.1.0",
-    "System.Diagnostics.Process": "4.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.csproj b/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.csproj
new file mode 100644
index 0000000..2ff1be3
--- /dev/null
+++ b/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Microsoft.IIS.Administration.WebServer Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.WebServer</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.WebServer</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Certificates\Microsoft.IIS.Administration.Certificates.csproj" />
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Core\Microsoft.IIS.Administration.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.Administration" Version="10.0.0" />
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.xproj b/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.xproj
deleted file mode 100644
index a971d0e..0000000
--- a/src/Microsoft.IIS.Administration.WebServer/Microsoft.IIS.Administration.WebServer.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>46906a4c-6a49-4d1d-b556-dbbd6f744976</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.WebServer</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration.WebServer/project.json b/src/Microsoft.IIS.Administration.WebServer/project.json
deleted file mode 100644
index d2b4281..0000000
--- a/src/Microsoft.IIS.Administration.WebServer/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Microsoft.IIS.Administration.WebServer Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "dependencies": {
-    "Microsoft.Web.Administration": "10.0.0",
-    "Microsoft.IIS.Administration.Certificates": "1.1.0",
-    "Microsoft.IIS.Administration.Core": "1.1.0",
-    "System.Diagnostics.Process": "4.1.0"
-  }
-}
diff --git a/src/Microsoft.IIS.Administration/Controllers/AccessKeysController.cs b/src/Microsoft.IIS.Administration/Controllers/AccessKeysController.cs
index 852a3c3..7c4ad00 100644
--- a/src/Microsoft.IIS.Administration/Controllers/AccessKeysController.cs
+++ b/src/Microsoft.IIS.Administration/Controllers/AccessKeysController.cs
@@ -11,10 +11,11 @@ namespace Microsoft.IIS.Administration {
     using AspNetCore.Mvc;
     using Core.Security;
     using Core.Utils;
-
+    using Microsoft.AspNetCore.Authorization;
 
 
     [DisableCors]
+    [Authorize(Policy ="ApiKeys")]
     public class AccessKeysController : Controller {
         private static IComparer<ApiKey> _comparer = new ApiKeyComparer();
         private IApiKeyProvider _keyProvider;
diff --git a/src/Microsoft.IIS.Administration/Errors/ErrorHelper.cs b/src/Microsoft.IIS.Administration/Errors/ErrorHelper.cs
index 6047e83..e237c78 100644
--- a/src/Microsoft.IIS.Administration/Errors/ErrorHelper.cs
+++ b/src/Microsoft.IIS.Administration/Errors/ErrorHelper.cs
@@ -6,7 +6,7 @@ namespace Microsoft.IIS.Administration {
     using System.Net;
 
 
-    public static class ErrorHelper {
+    static class ErrorHelper {
 
         public static dynamic AntiforgeryValidationError() {
             return new {
@@ -16,11 +16,11 @@ namespace Microsoft.IIS.Administration {
             };
         }
 
-        public static dynamic UnauthorizedError(string schema) {
+        public static dynamic UnauthorizedError(string schema, int status) {
             return new {
                 title = "Unauthorized",
                 authentication_scheme = schema,
-                status = (int)HttpStatusCode.Forbidden
+                status = status
             };
         }
     }
diff --git a/src/Microsoft.IIS.Administration/Logging/LoggingExtensions.cs b/src/Microsoft.IIS.Administration/Logging/LoggingExtensions.cs
index 32312b8..e0b647d 100644
--- a/src/Microsoft.IIS.Administration/Logging/LoggingExtensions.cs
+++ b/src/Microsoft.IIS.Administration/Logging/LoggingExtensions.cs
@@ -12,11 +12,16 @@ namespace Microsoft.IIS.Administration.Logging
     using AspNetCore.Hosting;
     using Serilog.Events;
     using Extensions.Configuration;
+    using System;
 
     public static class LoggingExtensions
     {
-        public static IServiceCollection AddApiLogging(this IServiceCollection services, IConfiguration configuration, IHostingEnvironment env)
-        {
+        public static IServiceCollection AddApiLogging(this IServiceCollection services) {
+            IServiceProvider sp = services.BuildServiceProvider();
+
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var env = sp.GetRequiredService<IHostingEnvironment>();
+
             var loggingConfiguration = new LoggingConfiguration(configuration);
             var logsRoot = loggingConfiguration.LogsRoot;
             var minLevel = loggingConfiguration.MinLevel;
@@ -47,8 +52,13 @@ namespace Microsoft.IIS.Administration.Logging
             return services;
         }
 
-        public static IServiceCollection AddApiAuditing(this IServiceCollection services, IConfiguration configuration, IHostingEnvironment env)
+        public static IServiceCollection AddApiAuditing(this IServiceCollection services)
         {
+            IServiceProvider sp = services.BuildServiceProvider();
+
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var env = sp.GetRequiredService<IHostingEnvironment>();
+
             var auditingConfiguration = new AuditingConfiguration(configuration);
             var auditRoot = auditingConfiguration.AuditingRoot;
             var minLevel = auditingConfiguration.MinLevel;
diff --git a/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.csproj b/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.csproj
new file mode 100644
index 0000000..30d33f0
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <VersionPrefix>1.1.1</VersionPrefix>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>Microsoft.IIS.Administration</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Microsoft.IIS.Administration</PackageId>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="wwwroot\**\*;Views\**\*">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>
+    <None Update="Properties\PublishProfiles;node_modules;bower_components;**.xproj;**.user;**.vspscc;approot;log.txt;logs;config\**\*;plugins">
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.IIS.Administration.Files.Core\Microsoft.IIS.Administration.Files.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.WebListener" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
+  </ItemGroup>
+
+  <Target Name="PostcompileScript" AfterTargets="Build">
+    <Exec Command="bower install" />
+  </Target>
+
+  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+    <Exec Command="bower install" />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.xproj b/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.xproj
deleted file mode 100644
index f3dc3a4..0000000
--- a/src/Microsoft.IIS.Administration/Microsoft.IIS.Administration.xproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9c2ed81d-e4bf-4bf1-a9a0-278654b89313</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <DevelopmentServerPort>55537</DevelopmentServerPort>
-    <IISExpressWindowsAuthentication>Disabled</IISExpressWindowsAuthentication>
-    <IISExpressAnonymousAuthentication>Enabled</IISExpressAnonymousAuthentication>
-    <SSLPort>44301</SSLPort>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <DnxInvisibleFolder Include="approot\" />
-    <DnxInvisibleFolder Include="logs\" />
-    <DnxInvisibleFolder Include="plugins\" />
-  </ItemGroup>
-  <ItemGroup>
-    <DnxInvisibleContent Include="log.txt" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/Program.cs b/src/Microsoft.IIS.Administration/Program.cs
index 700d939..d79e719 100644
--- a/src/Microsoft.IIS.Administration/Program.cs
+++ b/src/Microsoft.IIS.Administration/Program.cs
@@ -2,24 +2,33 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 
-namespace Microsoft.IIS.Administration
-{
+namespace Microsoft.IIS.Administration {
     using System.IO;
     using AspNetCore.Hosting;
     using AspNetCore.Builder;
+    using Net.Http.Server;
+    using Microsoft.Extensions.Configuration;
 
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var host = new WebHostBuilder()
-                .UseKestrel()
+
+    public class Program {
+        public static void Main(string[] args) {
+            IConfigurationRoot config = Startup.LoadConfig(Path.Combine(Directory.GetCurrentDirectory(), "config"));
+
+            //
+            // Host
+            using (var host = new WebHostBuilder()
                 .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
+                .UseUrls("https://*:55539") // Config can override it. Use "urls":"https://*:55539"
+                .UseConfiguration(config)
                 .UseStartup<Startup>()
-                .Build();
+                .UseWebListener(o => {
+                    o.ListenerSettings.Authentication.Schemes = AuthenticationSchemes.Negotiate | AuthenticationSchemes.NTLM;
+                    o.ListenerSettings.Authentication.AllowAnonymous = true;
+                })
+                .Build()) {
 
-            host.Run();
+                host.Run();
+            }
         }
     }
 }
diff --git a/src/Microsoft.IIS.Administration/Properties/launchSettings.json b/src/Microsoft.IIS.Administration/Properties/launchSettings.json
index 48b9287..8faeaf7 100644
--- a/src/Microsoft.IIS.Administration/Properties/launchSettings.json
+++ b/src/Microsoft.IIS.Administration/Properties/launchSettings.json
@@ -23,6 +23,10 @@
       "environmentVariables": {
         "Hosting:Environment": "Development"
       }
+    },
+    "Microsoft.IIS.Administration": {
+      "commandName": "Project",
+      "applicationUrl": "http://localhost:55539"
     }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/Security/AccessPolicyOptions.cs b/src/Microsoft.IIS.Administration/Security/AccessPolicyOptions.cs
new file mode 100644
index 0000000..91f9099
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/AccessPolicyOptions.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security {
+    using Microsoft.Extensions.Configuration;
+    using System.Collections.Generic;
+
+
+    class AccessPolicyOptions {
+        public AccessPolicyOptions(IConfiguration config) {
+            IConfigurationSection section = config.GetSection("security:access_policy");
+            if (section == null) {
+                return;
+            }
+
+            Api = GetPolicies(section, "api", "users:administrators+AccessKey");
+            ApiKeys = GetPolicies(section, "api_keys", "users:administrators");
+            System = GetPolicies(section, "system", "users:owners+AccessKey");
+        }
+
+        public IEnumerable<string> Api { get; private set; }
+        public IEnumerable<string> ApiKeys { get; private set; }
+        public IEnumerable<string> System { get; private set; }
+
+
+        private IEnumerable<string> GetPolicies(IConfigurationSection section, string policyName, string defaultValue) {
+            string values = section.GetValue(policyName, defaultValue);
+
+            var result = new List<string>();
+
+            foreach (var v in values.Split('+')) {
+                if (!string.IsNullOrWhiteSpace(v)) {
+                    result.Add(v.Trim());
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationHandler.cs b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationHandler.cs
new file mode 100644
index 0000000..ba09682
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationHandler.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.IIS.Administration.Core.Http;
+    
+
+    sealed class AuthorizationHandler : AuthorizationHandler<IAssertAuthorizationRequirement> {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext ctx, IAssertAuthorizationRequirement requirement) {
+            HttpHelper.Current.SetAuthorizationHandlerContext(ctx);
+
+            if (requirement.Assert(ctx)) {
+                ctx.Succeed(requirement);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicy.cs
new file mode 100644
index 0000000..43d18cf
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicy.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.AspNetCore.Authentication.JwtBearer;
+    using System.Collections.Generic;
+
+
+
+    sealed class AuthorizationPolicy {
+        private RoleMapping _roleMapping;
+        private AccessPolicyOptions _options;
+
+        public AuthorizationPolicy(IConfiguration config) {
+            if (config == null) {
+                throw new ArgumentNullException(nameof(config));
+            }
+
+            _roleMapping = new RoleMapping(config);
+            _options = new AccessPolicyOptions(config);
+        }
+
+        public void Configure(AuthorizationOptions o) {
+            //
+            // Users
+            o.AddPolicy("Users", p => p.AddAuthenticationSchemes("Negotiate", "NTLM").RequireAuthenticatedUser());
+
+
+            //
+            // AccessKey
+            o.AddPolicy("AccessKey", p => {
+                p.AddAuthenticationSchemes(JwtBearerDefaults.AuthenticationScheme)
+                 .RequireAuthenticatedUser()
+                 .AddRequirements(new BearerAuthorizationPolicy());
+            });
+
+
+            //
+            // ReadOnly 
+            o.AddPolicy("ReadOnly", p => p.AddRequirements(new ReadOnlyPolicy()));
+
+
+            //
+            // Forbidden
+            o.AddPolicy("Forbidden", p => p.AddRequirements(new ForbiddenPolicy()));
+
+
+            //
+            // Api policy
+            o.AddPolicy("Api", p => {
+                p.RequireAuthenticatedUser();
+                AddRequirements(p, o, _options.Api);
+            });
+
+
+            //
+            // ApiKeys policy
+            o.AddPolicy("ApiKeys", p => {
+                p.RequireAuthenticatedUser();
+                AddRequirements(p, o, _options.ApiKeys);
+            });
+
+
+            //
+            // System policy
+            o.AddPolicy("System", p => {
+                p.RequireAuthenticatedUser();
+                AddRequirements(p, o, _options.System);
+            });
+        }
+
+        private void AddRequirements(AuthorizationPolicyBuilder builder, AuthorizationOptions options, IEnumerable<string> requirements) {
+            foreach (var r in requirements) {
+                var values = r.Split(':');
+                string name = values[0];
+
+                //
+                // Add policy
+                builder.Combine(options.GetPolicy(name) ?? throw new Exception($"{name} requirement not found"));
+
+                if (values.Length == 1) {
+                    return;
+                }
+
+                //
+                // Users
+                if (name.Equals("Users", StringComparison.OrdinalIgnoreCase)) {
+                    builder.AddRequirements(new NtlmAuthorizationPolicy(values[1], _roleMapping));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyExtensions.cs b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyExtensions.cs
new file mode 100644
index 0000000..1e7b6d5
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyExtensions.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Http;
+
+
+    static class AuthorizationPolicyExtensions {
+        const string AuthorizationContext_Key = "Authorization:AuthorizationHandlerContext";
+
+        public static IServiceCollection AddAuthorizationPolicy(this IServiceCollection services) {
+            var config = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
+
+            return services.AddAuthorization(o => new AuthorizationPolicy(config).Configure(o))
+                           .AddSingleton<IAuthorizationHandler, AuthorizationHandler>();
+        }
+
+        public static IApplicationBuilder UseAuthorizationPolicy(this IApplicationBuilder builder) {
+            return builder.UseMiddleware<AuthorizationPolicyMiddleware>();
+        }
+
+        public static AuthorizationHandlerContext GetAuthorizationHandlerContext(this HttpContext ctx) {
+            return (AuthorizationHandlerContext)ctx.Items[AuthorizationContext_Key];
+        }
+
+        public static void SetAuthorizationHandlerContext(this HttpContext ctx, AuthorizationHandlerContext authorizationContext) {
+            ctx.Items[AuthorizationContext_Key] = authorizationContext;
+        }
+
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyMiddleware.cs b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyMiddleware.cs
new file mode 100644
index 0000000..9f59081
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/AuthorizationPolicyMiddleware.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using System.Threading.Tasks;
+    using AspNetCore.Authorization;
+    using AspNetCore.Http;
+    using Microsoft.IIS.Administration.Core;
+    using System.Linq;
+
+
+    sealed class AuthorizationPolicyMiddleware {
+        private readonly RequestDelegate _next;
+
+
+        public AuthorizationPolicyMiddleware(RequestDelegate next) {
+            _next = next ?? throw new ArgumentNullException(nameof(next));
+        }
+
+
+        public async Task Invoke(HttpContext context, IAuthorizationService authorizationService) {
+            HttpResponse response = context.Response;
+
+            try {
+                await _next(context);
+            }
+            catch (UnauthorizedArgumentException) {
+                response.Clear();
+                response.StatusCode = StatusCodes.Status403Forbidden;
+            }
+
+            //
+            // Handle only 401 and 403
+            if (response.StatusCode != StatusCodes.Status403Forbidden &&
+                response.StatusCode != StatusCodes.Status401Unauthorized) {
+                return;
+            }
+
+            //
+            // Get uncompleted AuthorizationPolicy
+            AuthorizationHandlerContext azContext = context.GetAuthorizationHandlerContext();
+            IAuthorizationPolicy policy = (IAuthorizationPolicy)azContext?.PendingRequirements.Where(r => r is IAuthorizationPolicy).FirstOrDefault() ?? null;
+
+            //
+            // Do Challenge
+            if (policy != null) {
+                await policy.Challenge(context);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/BearerAuthorizationPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/BearerAuthorizationPolicy.cs
new file mode 100644
index 0000000..76cb0f7
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/BearerAuthorizationPolicy.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Authentication.JwtBearer;
+    using Headers = Net.Http.Headers;
+    using System.Threading.Tasks;
+    using Microsoft.IIS.Administration.Core.Http;
+    using Newtonsoft.Json;
+
+
+
+    sealed class BearerAuthorizationPolicy : IAssertAuthorizationRequirement, IAuthorizationPolicy {
+        public BearerAuthorizationPolicy() {
+            Assert = ctx => ctx.User.HasClaim(c => c.Type == Core.Security.ClaimTypes.AccessToken);
+        }
+
+        public Func<AuthorizationHandlerContext, bool> Assert { get; private set; }
+
+        public async Task Challenge(HttpContext ctx) {
+            HttpResponse response = ctx.Response;
+
+            if (!response.Headers.Keys.Contains(Headers.HeaderNames.WWWAuthenticate)) {
+                response.Headers.Append(Headers.HeaderNames.WWWAuthenticate, JwtBearerDefaults.AuthenticationScheme);
+            }
+
+            response.StatusCode = StatusCodes.Status403Forbidden;
+
+            response.ContentType = JsonProblem.CONTENT_TYPE;
+            response.Headers[Headers.HeaderNames.ContentLanguage] = JsonProblem.CONTENT_LANG;
+
+            object error = Administration.ErrorHelper.UnauthorizedError(JwtBearerDefaults.AuthenticationScheme, response.StatusCode);
+            await response.WriteAsync(JsonConvert.SerializeObject(error));
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/ForbiddenPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/ForbiddenPolicy.cs
new file mode 100644
index 0000000..9fd77df
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/ForbiddenPolicy.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
+
+
+    sealed class ForbiddenPolicy : IAssertAuthorizationRequirement, IAuthorizationPolicy {
+
+        public ForbiddenPolicy() {
+            Assert = _=> false;
+        }
+
+        public Func<AuthorizationHandlerContext, bool> Assert { get; private set; }
+
+        public Task Challenge(HttpContext ctx) {
+            ctx.Response.StatusCode = StatusCodes.Status403Forbidden;
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/IAssertAuthorizationRequirement.cs b/src/Microsoft.IIS.Administration/Security/Authorization/IAssertAuthorizationRequirement.cs
new file mode 100644
index 0000000..48bbeb5
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/IAssertAuthorizationRequirement.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using Microsoft.AspNetCore.Authorization;
+
+    
+    interface IAssertAuthorizationRequirement : IAuthorizationRequirement {
+        Func<AuthorizationHandlerContext, bool> Assert { get; }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/IAuthorizationPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/IAuthorizationPolicy.cs
new file mode 100644
index 0000000..9e7cf72
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/IAuthorizationPolicy.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using Microsoft.AspNetCore.Http;
+    using System.Threading.Tasks;
+
+
+    interface IAuthorizationPolicy {
+        Task Challenge(HttpContext ctx);
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/NtlmAuthorizationPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/NtlmAuthorizationPolicy.cs
new file mode 100644
index 0000000..4a6dca5
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/NtlmAuthorizationPolicy.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
+    using Headers = Net.Http.Headers;
+    using Microsoft.IIS.Administration.Core.Http;
+    using Newtonsoft.Json;
+
+
+
+    sealed class NtlmAuthorizationPolicy : IAssertAuthorizationRequirement, IAuthorizationPolicy {
+
+        public NtlmAuthorizationPolicy(string role, RoleMapping mapping) {
+            Assert = ctx => mapping.IsUserInRole(ctx.User, role);
+        }
+
+        public Func<AuthorizationHandlerContext, bool> Assert { get; private set; }
+
+        public async Task Challenge(HttpContext ctx) {
+            HttpResponse response = ctx.Response;
+
+            if (!response.Headers.Keys.Contains(Headers.HeaderNames.WWWAuthenticate)) {
+                response.Headers.Append(Headers.HeaderNames.WWWAuthenticate, "Negotiate");
+                response.Headers.Append(Headers.HeaderNames.WWWAuthenticate, "NTLM");
+            }
+
+            response.StatusCode = StatusCodes.Status401Unauthorized;
+
+            response.ContentType = JsonProblem.CONTENT_TYPE;
+            response.Headers[Headers.HeaderNames.ContentLanguage] = JsonProblem.CONTENT_LANG;
+
+            object error = Administration.ErrorHelper.UnauthorizedError("Negotiate,NTLM", response.StatusCode);
+            await response.WriteAsync(JsonConvert.SerializeObject(error));
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/Authorization/ReadOnlyPolicy.cs b/src/Microsoft.IIS.Administration/Security/Authorization/ReadOnlyPolicy.cs
new file mode 100644
index 0000000..b36b7bf
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/Authorization/ReadOnlyPolicy.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security.Authorization {
+    using System;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.IIS.Administration.Core.Http;
+
+
+    sealed class ReadOnlyPolicy : IAssertAuthorizationRequirement, IAuthorizationPolicy {
+
+        public ReadOnlyPolicy() {
+            Assert = _=> {
+                string verb = HttpHelper.Current.Request.Method.ToUpper();
+                return verb == "GET" || verb == "HEAD" || verb == "OPTIONS";
+            };
+        }
+
+        public Func<AuthorizationHandlerContext, bool> Assert { get; private set; }
+
+        public Task Challenge(HttpContext ctx) {
+            ctx.Response.StatusCode = StatusCodes.Status405MethodNotAllowed;
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Microsoft.IIS.Administration/Security/BearerTokenValidator.cs b/src/Microsoft.IIS.Administration/Security/BearerTokenValidator.cs
index e74ac4d..c02ba52 100644
--- a/src/Microsoft.IIS.Administration/Security/BearerTokenValidator.cs
+++ b/src/Microsoft.IIS.Administration/Security/BearerTokenValidator.cs
@@ -5,23 +5,20 @@
 namespace Microsoft.IIS.Administration.Security {
     using System;
     using System.Collections.Generic;
-    using System.IdentityModel.Tokens;
     using System.Security.Claims;
     using Core.Http;
     using Core.Security;
     using AspNetCore.Authentication.JwtBearer;
     using IdentityModel.Tokens;
 
+
+
     public class BearerTokenValidator : ISecurityTokenValidator {
         private IApiKeyProvider _keyProvider;
 
 
         public BearerTokenValidator(IApiKeyProvider keyProvider) {
-            if (keyProvider == null) {
-                throw new ArgumentNullException(nameof(keyProvider));
-            }
-
-            _keyProvider = keyProvider;
+            _keyProvider = keyProvider ?? throw new ArgumentNullException(nameof(keyProvider));
         }
 
         public bool CanValidateToken {
@@ -107,6 +104,7 @@ namespace Microsoft.IIS.Administration.Security {
         }
 
         public void OnValidatedToken(TokenValidatedContext ctx) {
+            /*
             // 
             // Join identities if successfully authenticated
             if (ctx.Ticket?.Principal?.Identity?.IsAuthenticated == true) {
@@ -117,6 +115,7 @@ namespace Microsoft.IIS.Administration.Security {
                     ctx.HttpContext.User = ctx.Ticket.Principal;
                 }
             }
+            */
         }
     }
 }
diff --git a/src/Microsoft.IIS.Administration/Security/RoleMapping.cs b/src/Microsoft.IIS.Administration/Security/RoleMapping.cs
new file mode 100644
index 0000000..53fb992
--- /dev/null
+++ b/src/Microsoft.IIS.Administration/Security/RoleMapping.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+namespace Microsoft.IIS.Administration.Security {
+    using Microsoft.Extensions.Configuration;
+    using System;
+    using System.Collections.Generic;
+    using System.Security.Claims;
+    using System.Security.Principal;
+
+
+    sealed class RoleMapping {
+        private IConfiguration _config;
+        private Dictionary<string, IEnumerable<string>> _roles = new Dictionary<string, IEnumerable<string>>();
+
+        public RoleMapping(IConfiguration config) {
+            _config = config ?? throw new ArgumentNullException(nameof(config));
+        }
+
+        public bool IsUserInRole(ClaimsPrincipal user, string role) {
+            if (string.IsNullOrEmpty(role)) {
+                throw new ArgumentNullException(nameof(role));
+            }
+
+            IEnumerable<string> roleMappings = GetRoleMappings(role.ToLower());
+
+            foreach (var identity in user.Identities) {
+                WindowsIdentity wi = identity as WindowsIdentity;
+                WindowsPrincipal wp = null;
+
+                foreach (var entry in roleMappings) {
+                    //
+                    // Check Identity
+                    if (string.Equals(identity.Name, entry, StringComparison.OrdinalIgnoreCase)) {
+                        return true;
+                    }
+
+                    //
+                    // Check Principal
+                    if (user.IsInRole(entry)) {
+                        return true;
+                    }
+
+                    //
+                    // Check Windows Principal
+                    if (wp == null && wi != null) {
+                        wp = new WindowsPrincipal(wi);
+                    }
+
+                    if (wp != null && wp.IsInRole(entry)) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private IEnumerable<string> GetRoleMappings(string role) {
+            IEnumerable<string> identities = null;
+
+            if (_roles.TryGetValue(role, out identities)) {
+                return identities;
+            }
+
+            //
+            // Load identities
+            identities = new List<string>();
+            ConfigurationBinder.Bind(_config.GetSection("security:users:" + role), identities);
+
+            //
+            // Copy on wright
+            var roles = new Dictionary<string, IEnumerable<string>>(_roles);
+
+            // Add role identities
+            roles[role] = identities;
+
+            //
+            // Replace the original
+            _roles = roles;
+
+            return identities;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/Security/SSLCheck.cs b/src/Microsoft.IIS.Administration/Security/SSLCheck.cs
deleted file mode 100644
index 0fd6088..0000000
--- a/src/Microsoft.IIS.Administration/Security/SSLCheck.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-
-namespace Microsoft.IIS.Administration.Security {
-    using AspNetCore.Http;
-    using System.Threading.Tasks;
-    using Extensions.Primitives;
-    using System.Net;
-    using Core.Http;
-    using Newtonsoft.Json;
-
-
-    public class SSLCheck {
-        RequestDelegate _next;
-
-        public SSLCheck(RequestDelegate next) {
-            _next = next;
-        }
-
-        public async Task Invoke(HttpContext context) {
-            StringValues values;
-
-            if (context.Request.IsHttps || context.Request.Headers.TryGetValue(HeaderNames.X_Forwarded_Proto, out values) &&
-                values.Count > 0 &&
-                values[0] == "https") {
-
-                //
-                // SSL is provided. Allow to continue
-                await _next(context);
-            }
-            else {
-                //
-                // SSL not provided
-                // Request Upgrade
-                context.Response.Clear();
-
-                context.Response.ContentType = JsonProblem.CONTENT_TYPE;
-                context.Response.Headers[Net.Http.Headers.HeaderNames.ContentLanguage] = JsonProblem.CONTENT_LANG;
-                context.Response.Headers[Net.Http.Headers.HeaderNames.Upgrade] = "TLS/1.0, HTTP/1.1";
-
-                context.Response.StatusCode = (int)HttpStatusCode.UpgradeRequired;
-
-                await context.Response.WriteAsync(JsonConvert.SerializeObject(SslRequiredError()));
-            }
-        }
-
-        private static object SslRequiredError() {
-            return new {
-                title = "Upgrade",
-                detail = "Requires HTTPS",
-                status = (int)HttpStatusCode.UpgradeRequired
-            };
-        }
-
-    }
-}
diff --git a/src/Microsoft.IIS.Administration/Security/UrlAuthorizationMiddleware.cs b/src/Microsoft.IIS.Administration/Security/UrlAuthorizationMiddleware.cs
deleted file mode 100644
index 3e6b209..0000000
--- a/src/Microsoft.IIS.Administration/Security/UrlAuthorizationMiddleware.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-
-namespace Microsoft.IIS.Administration.Security {
-    using System;
-    using System.Threading.Tasks;
-    using AspNetCore.Authorization;
-    using AspNetCore.Http;
-    using AspNetCore.Builder;
-    using Newtonsoft.Json;
-    using Core.Http;
-    using Headers = Net.Http.Headers;
-    
-
-    public class UrlAuthorizationMiddleware {
-        private readonly RequestDelegate _next;
-        private readonly UrlAuthorizatonOptions _options;
-
-
-        public UrlAuthorizationMiddleware(RequestDelegate next, UrlAuthorizatonOptions options) {
-            if (next == null) {
-                throw new ArgumentNullException(nameof(next));
-            }
-
-            if (options == null) {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            if (string.IsNullOrEmpty(options.Path)) {
-                throw new ArgumentNullException(nameof(options.Path));
-            }
-
-            _next = next;
-            _options = options;
-        }
-
-
-        public async Task Invoke(HttpContext context, IAuthorizationService authorizationService) {
-
-            if (context.Request.Path.StartsWithSegments(_options.Path)) {
-                bool authorized;
-
-                if (!string.IsNullOrEmpty(_options.PolicyName)) {
-                    authorized = await authorizationService.AuthorizeAsync(context.User, null, _options.PolicyName);
-                }
-                else {
-                    authorized = context.User?.Identity?.IsAuthenticated ?? false;
-                }
-
-                if (!authorized) {
-                    var response = context.Response;
-
-                    response.Headers.Add(Headers.HeaderNames.WWWAuthenticate, _options.AuthenticationScheme);
-
-                    // 
-                    // Not authorized, return HTTP 403 Forbidden instead of 401
-                    // 401 breaks integrated host authentication
-                    await context.Authentication.ForbidAsync(_options.AuthenticationScheme);
-
-                    //
-                    // Set proper response
-                    response.ContentType = JsonProblem.CONTENT_TYPE;
-                    response.Headers[Headers.HeaderNames.ContentLanguage] = JsonProblem.CONTENT_LANG;
-
-                    object error = Administration.ErrorHelper.UnauthorizedError(_options.AuthenticationScheme);
-                    await response.WriteAsync(JsonConvert.SerializeObject(error));
-
-                    return;
-                }
-            }
-
-            //
-            // Allow to continue
-            await _next(context);
-        }
-    }
-
-
-    public class UrlAuthorizatonOptions {
-        public PathString Path { get; set; } = "/";
-        public string PolicyName { get; set; }
-        public string AuthenticationScheme { get; set; }
-    }
-
-
-    public static class UrlAuthorizationExtensions {
-        public static IApplicationBuilder UseUrlAuthorization(this IApplicationBuilder builder, UrlAuthorizatonOptions options) {
-            return builder.UseMiddleware<UrlAuthorizationMiddleware>(options);
-        }
-    }
-}
diff --git a/src/Microsoft.IIS.Administration/Startup.cs b/src/Microsoft.IIS.Administration/Startup.cs
index fd46eac..94e5d0c 100644
--- a/src/Microsoft.IIS.Administration/Startup.cs
+++ b/src/Microsoft.IIS.Administration/Startup.cs
@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 
-namespace Microsoft.IIS.Administration
-{
+namespace Microsoft.IIS.Administration {
     using AspNetCore.Antiforgery.Internal;
-    using AspNetCore.Authentication.JwtBearer;
-    using AspNetCore.Authorization;
     using AspNetCore.Builder;
     using AspNetCore.Hosting;
     using AspNetCore.Http;
@@ -22,47 +19,48 @@ namespace Microsoft.IIS.Administration
     using Extensions.DependencyInjection.Extensions;
     using Files;
     using Logging;
+    using Microsoft.IIS.Administration.Security.Authorization;
     using Security;
     using Serilog;
     using System;
     using System.Collections.Generic;
     using System.IO;
 
-    public class Startup : BaseModule
-    {
-        public IConfiguration Configuration { get; set; }
+    public class Startup : BaseModule {
+        private IConfiguration _config;
+        private IHostingEnvironment _hostingEnv;
 
-        public IHostingEnvironment HostingEnvironment { get; set; }
 
-        public Startup(IHostingEnvironment env)
-        {
-            HostingEnvironment = env;
-
-            // Set up configuration sources.
-            var builder = new ConfigurationBuilder();
-            builder.SetBasePath(env.GetConfigPath());
-            builder.AddJsonFile("appsettings.json")
-                .AddEnvironmentVariables();
-            Configuration = ConfigurationHelper.Configuration = builder.Build();
+        public static IConfigurationRoot LoadConfig(string path) {
+            //
+            // Set up Configuration
+            return new ConfigurationBuilder()
+                .SetBasePath(path)
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+        }
 
+        public Startup(IHostingEnvironment env) {
+            _hostingEnv = env;
+            _config = ConfigurationHelper.Configuration = LoadConfig(env.GetConfigPath());
         }
 
         // This method gets called by a runtime.
         // Use this method to add services to the container
-        public void ConfigureServices(IServiceCollection services)
-        {
+        public void ConfigureServices(IServiceCollection services) {
             //
             // Configuration
-            services.AddSingleton((s) => Configuration);
+            services.AddSingleton<IConfiguration>(_config);
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             //
             // Logging
-            services.AddApiLogging(Configuration, HostingEnvironment);
+            services.AddApiLogging();
 
             //
             // Auditing
-            services.AddApiAuditing(Configuration, HostingEnvironment);
+            services.AddApiAuditing();
 
             //
             // Files
@@ -70,8 +68,8 @@ namespace Microsoft.IIS.Administration
 
             //
             // Load plugins
-            ModuleConfig modConfig = new ModuleConfig(HostingEnvironment.GetConfigPath("modules.json"));
-            ModuleLoader loader = new ModuleLoader(HostingEnvironment);
+            ModuleConfig modConfig = new ModuleConfig(_hostingEnv.GetConfigPath("modules.json"));
+            ModuleLoader loader = new ModuleLoader(_hostingEnv);
             LoadPlugins(loader, modConfig.Modules);
             AdminHost.Instance.ConfigureModules(services);
 
@@ -86,21 +84,15 @@ namespace Microsoft.IIS.Administration
             //
             // Authentication
             services.AddAuthentication();
-            services.AddAuthorization(o => {
-                o.AddPolicy("AccessToken", p => p.RequireAuthenticatedUser().RequireClaim(Core.Security.ClaimTypes.AccessToken));
 
-                o.AddPolicy("Administrators", p => p.RequireAuthenticatedUser().RequireRole("Administrators"));
-
-                o.AddPolicy("AdministrativeGroup", p => p.RequireAuthenticatedUser().RequireAssertion(authContext =>
-                    IsUserInAdministrators(authContext, Configuration)
-                ));
-            });
+            //
+            // Authorization
+            services.AddAuthorizationPolicy();
 
             //
             // Antiforgery
             services.TryAddSingleton<IAntiforgeryTokenStore, AntiForgeryTokenStore>();
-            services.AddAntiforgery(o =>
-            {
+            services.AddAntiforgery(o => {
                 o.RequireSsl = true;
                 o.CookieName = o.FormFieldName = HeaderNames.XSRF_TOKEN;
             });
@@ -140,9 +132,7 @@ namespace Microsoft.IIS.Administration
         }
 
         // Configure is called after ConfigureServices is called.
-        public void Configure(IApplicationBuilder app,
-                              IHttpContextAccessor contextAccessor)
-        {
+        public void Configure(IApplicationBuilder app, IHttpContextAccessor contextAccessor) {
             //
             // Initialize the Environment
             //
@@ -154,7 +144,7 @@ namespace Microsoft.IIS.Administration
             HttpHelper.HttpContextAccessor = contextAccessor;
 
             // Initalize Config
-            ConfigurationHelper.Initialize(HostingEnvironment.GetConfigPath("appsettings.json"));
+            ConfigurationHelper.Initialize(_hostingEnv.GetConfigPath("appsettings.json"));
 
 
             //
@@ -162,10 +152,6 @@ namespace Microsoft.IIS.Administration
             //
             app.UseErrorHandler();
 
-            //
-            // Ensure SSL
-            //
-            app.UseMiddleware<SSLCheck>();
 
             //
             // Static files
@@ -188,26 +174,13 @@ namespace Microsoft.IIS.Administration
             //
             // Authorization
             // 
-            app.UseUrlAuthorization(new UrlAuthorizatonOptions
-            {
-                Path = "/" + Globals.API_PATH,  // /api
-                AuthenticationScheme = JwtBearerDefaults.AuthenticationScheme,
-                PolicyName = "AccessToken"
-            });
-
-            app.UseUrlAuthorization(new UrlAuthorizatonOptions
-            {
-                Path = "/" + Globals.SECURITY_PATH, // /security
-                AuthenticationScheme = "NTLM",
-                PolicyName = "AdministrativeGroup"
-            });
+            app.UseAuthorizationPolicy();
 
 
             //
             // Disable client cache
             //
-            app.Use(async (context, next) =>
-            {
+            app.Use(async (context, next) => {
                 context.Response.Headers[Net.Http.Headers.HeaderNames.CacheControl] = "public, max-age=0";
                 await next.Invoke();
             });
@@ -218,7 +191,6 @@ namespace Microsoft.IIS.Administration
             app.UseMiddleware<HeadTransform>();
 
 
-
             //
             // Add MVC
             // 
@@ -346,47 +318,6 @@ namespace Microsoft.IIS.Administration
             }
         }
 
-        private static bool IsUserInAdministrators(AuthorizationHandlerContext authContext, IConfiguration configuration)
-        {
-            var administrators = new List<string>();
-            ConfigurationBinder.Bind(configuration.GetSection("administrators"), administrators);
-
-            var winUser = HttpHelper.Current.Authentication.AuthenticateAsync("NTLM").Result;
-
-            foreach (var identifier in administrators)
-            {
-
-                // Is user in an administrative role
-                if (authContext.User.IsInRole(identifier))
-                {
-                    return true;
-                }
-
-                // Is user an administrative user
-                foreach (var identity in authContext.User.Identities)
-                {
-                    if (identity.Name != null && identity.Name.Equals(identifier, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return true;
-                    }
-                }
-
-                //
-                // Aspnet/Common bug #85 https://github.com/aspnet/Common/issues/85
-                // AuthorizationHandlerContext.User.IsInRole does not work for integrated authentication
-                // Work around is explicitly calling authenticate for NTLM
-                //
-                if (winUser != null)
-                {
-                    if (winUser.IsInRole(identifier))
-                    {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
         public override void Start()
         {
             // Nop
diff --git a/src/Microsoft.IIS.Administration/Views/AccessKeys/Index.cshtml b/src/Microsoft.IIS.Administration/Views/AccessKeys/Index.cshtml
index 46e7c77..c3820a1 100644
--- a/src/Microsoft.IIS.Administration/Views/AccessKeys/Index.cshtml
+++ b/src/Microsoft.IIS.Administration/Views/AccessKeys/Index.cshtml
@@ -74,7 +74,7 @@
             <br/>
             <p class="right">
                 <input class="btn" id="cancel" type="button" value="Cancel" />
-                <input class="btn btn-default" id="generate" type="submit" value="Create it" />
+                <input class="btn btn-default" id="generate" type="submit" value="Create" />
             </p>
         </div>
         @(formToken)
diff --git a/src/Microsoft.IIS.Administration/Views/Connect/Index.cshtml b/src/Microsoft.IIS.Administration/Views/Connect/Index.cshtml
index 804ebe3..e13a472 100644
--- a/src/Microsoft.IIS.Administration/Views/Connect/Index.cshtml
+++ b/src/Microsoft.IIS.Administration/Views/Connect/Index.cshtml
@@ -20,7 +20,7 @@
             <fieldset>
                 <label>Access Token</label>
                 <input id="token" type="text" autofocus />
-                <small style="float:right;"><a href="/security/tokens">Get Access Token</a></small>
+                <small class="right">Don't have one? <a href="/security/tokens">Get Access Token</a></small>
             </fieldset>
         </p>
         <div class="rememberMe">
diff --git a/src/Microsoft.IIS.Administration/project.json b/src/Microsoft.IIS.Administration/project.json
deleted file mode 100644
index c48347e..0000000
--- a/src/Microsoft.IIS.Administration/project.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "version": "1.1.1",
-  "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
-  },
-  "buildOptions": {
-    "allowUnsafe": true,
-    "emitEntryPoint": true,
-    "preserveCompilationContext": true
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "version": "1.0.0",
-      "type": "platform"
-    },
-    "Microsoft.AspNetCore.Antiforgery": "1.0.1",
-    "Microsoft.AspNetCore.Authentication": "1.0.0",
-    "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0",
-    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
-    "Microsoft.Extensions.Configuration": "1.0.0",
-    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0",
-    "Microsoft.Extensions.Configuration.Binder": "1.0.0",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
-    "Microsoft.AspNetCore.Routing": "1.0.1",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
-    "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
-    "Microsoft.IIS.Administration.Files.Core": "1.1.0"
-  },
-
-  "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "publishOptions": {
-    "include": [
-      "wwwroot",
-      "Views",
-      "web.config"
-    ],
-    "exclude": [
-      "Properties/PublishProfiles",
-      "node_modules",
-      "bower_components",
-      "**.xproj",
-      "**.user",
-      "**.vspscc",
-      "approot",
-      "log.txt",
-      "logs",
-      "config",
-      "plugins"
-    ]
-  },
-  "webroot": "wwwroot",
-
-  "scripts": {
-    "postcompile": [ "bower install" ],
-    "prepublish": [ "bower install" ],
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/web.config b/src/Microsoft.IIS.Administration/web.config
deleted file mode 100644
index 3fea85d..0000000
--- a/src/Microsoft.IIS.Administration/web.config
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.webServer>
-    <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
-    </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="true" stdoutLogEnabled="false" />
-    <security>
-      <authentication>
-        <windowsAuthentication enabled="true" />
-      </authentication>
-      <authorization>
-        <clear />
-        <add accessType="Allow" roles="Administrators,IIS Administrators" />
-      </authorization>
-    </security>
-  </system.webServer>
-  <!-- 
-       ALWAYS PROTECTED SECURITY AREA 
-       THE HOST MUST PROVIDE ATHENTICATION
-       
-       [Windows Authentication]
-       [Client Certificate Authentication]
-  -->
-  <location path="security">
-    <system.webServer>
-      <security>
-        <authentication>
-          <anonymousAuthentication enabled="false" />
-          <windowsAuthentication enabled="true" />
-        </authentication>
-        <authorization>
-          <clear />
-          <add accessType="Deny" users="?" />
-          <add accessType="Allow" roles="Administrators,IIS Administrators" />
-        </authorization>
-      </security>
-    </system.webServer>
-  </location>
-  <!-- 
-      API area 
-      Protected by ACCESS TOKEN
-      The host can provide additional authentication on top
-  -->
-  <location path="api">
-    <system.webServer>
-      <security>
-        <authentication>
-          <!-- Need for CORs -->
-          <anonymousAuthentication enabled="true" />
-        </authentication>
-        <authorization>
-          <!-- Need for CORs -->
-          <add accessType="Allow" verbs="OPTIONS" users="*" />
-        </authorization>
-      </security>
-    </system.webServer>
-  </location>
-</configuration>
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/wwwroot/css/access-keys.css b/src/Microsoft.IIS.Administration/wwwroot/css/access-keys.css
index bc5170c..24c7c9f 100644
--- a/src/Microsoft.IIS.Administration/wwwroot/css/access-keys.css
+++ b/src/Microsoft.IIS.Administration/wwwroot/css/access-keys.css
@@ -56,7 +56,6 @@
 #newTokenForm #purpose {
     width:100%; 
     height:40px; 
-    padding: 3px;
 }
 
 #newTokenForm .expiration {
diff --git a/src/Microsoft.IIS.Administration/wwwroot/css/main.css b/src/Microsoft.IIS.Administration/wwwroot/css/main.css
index 58f1fa8..81504ee 100644
--- a/src/Microsoft.IIS.Administration/wwwroot/css/main.css
+++ b/src/Microsoft.IIS.Administration/wwwroot/css/main.css
@@ -215,7 +215,7 @@ fieldset {
 .border,
 input[type="text"] {
     border: 1px solid #0094ff;
-    padding: 3px;
+    padding: 8px;
 }
 
 .radio-row {
diff --git a/src/Microsoft.IIS.Administration/wwwroot/js/access-keys.js b/src/Microsoft.IIS.Administration/wwwroot/js/access-keys.js
index c805ecf..d9f95a1 100644
--- a/src/Microsoft.IIS.Administration/wwwroot/js/access-keys.js
+++ b/src/Microsoft.IIS.Administration/wwwroot/js/access-keys.js
@@ -7,6 +7,7 @@ $(document).ready(function () {
         $("#modal, #newTokenForm, #tokenForm").hide();
         $("#purpose").val("");
         $("#key").html("");
+        window.location.hash = "";
     });
 
     $("#showNewForm").click(function () {
@@ -73,4 +74,10 @@ $(document).ready(function () {
     if (sessionStorage['page'] == document.URL) {
         $(document).scrollTop(sessionStorage['scrollTop']);
     }
+
+    //
+    // Open create form
+    if (window.location.hash == '#new') {
+        $("#showNewForm").click();
+    }
 });
diff --git a/src/Microsoft.IIS.Administration/wwwroot/js/main.js b/src/Microsoft.IIS.Administration/wwwroot/js/main.js
index 3fa313f..cdc23b3 100644
--- a/src/Microsoft.IIS.Administration/wwwroot/js/main.js
+++ b/src/Microsoft.IIS.Administration/wwwroot/js/main.js
@@ -102,7 +102,7 @@ function signOut() {
 
 
 function isAccessTokenError(xhr) {
-    if (xhr.status == "403" && xhr.responseText) {
+    if ((xhr.status == "401" || xhr.status == "403") && xhr.responseText) {
         try {
             var json = $.parseJSON(xhr.responseText);
             return json.authentication_scheme == "Bearer";
diff --git a/src/Packager/Bundle/Bundle.csproj b/src/Packager/Bundle/Bundle.csproj
new file mode 100644
index 0000000..de14e1c
--- /dev/null
+++ b/src/Packager/Bundle/Bundle.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Bundles together all of the core plugins for the Microsoft IIS Administration API</Description>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Bundle</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Microsoft IIS Administration API Bundle</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.AccessManagement\Microsoft.IIS.Administration.AccessManagement.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.Certificates\Microsoft.IIS.Administration.Certificates.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.Files\Microsoft.IIS.Administration.Files.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Applications\Microsoft.IIS.Administration.WebServer.Applications.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.AppPools\Microsoft.IIS.Administration.WebServer.AppPools.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Authentication\Microsoft.IIS.Administration.WebServer.Authentication.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Authorization\Microsoft.IIS.Administration.WebServer.Authorization.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.CentralCertificates\Microsoft.IIS.Administration.WebServer.CentralCertificates.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Compression\Microsoft.IIS.Administration.WebServer.Compression.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.DefaultDocuments\Microsoft.IIS.Administration.WebServer.DefaultDocuments.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Delegation\Microsoft.IIS.Administration.WebServer.Delegation.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing\Microsoft.IIS.Administration.WebServer.DirectoryBrowsing.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Files\Microsoft.IIS.Administration.WebServer.Files.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Handlers\Microsoft.IIS.Administration.WebServer.Handlers.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.HttpRedirect\Microsoft.IIS.Administration.WebServer.HttpRedirect.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.HttpRequestTracing\Microsoft.IIS.Administration.WebServer.HttpRequestTracing.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders\Microsoft.IIS.Administration.WebServer.HttpResponseHeaders.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Info\Microsoft.IIS.Administration.WebServer.Info.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.IPRestrictions\Microsoft.IIS.Administration.WebServer.IPRestrictions.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Logging\Microsoft.IIS.Administration.WebServer.Logging.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Modules\Microsoft.IIS.Administration.WebServer.Modules.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.RequestFiltering\Microsoft.IIS.Administration.WebServer.RequestFiltering.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.RequestMonitor\Microsoft.IIS.Administration.WebServer.RequestMonitor.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Scm\Microsoft.IIS.Administration.WebServer.Scm.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.Sites\Microsoft.IIS.Administration.WebServer.Sites.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.SslSettings\Microsoft.IIS.Administration.WebServer.SslSettings.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.StaticContent\Microsoft.IIS.Administration.WebServer.StaticContent.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.VirtualDirectories\Microsoft.IIS.Administration.WebServer.VirtualDirectories.csproj" />
+    <ProjectReference Include="..\..\Microsoft.IIS.Administration.WebServer.WorkerProcesses\Microsoft.IIS.Administration.WebServer.WorkerProcesses.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Packager/Bundle/Program.cs b/src/Packager/Bundle/Program.cs
new file mode 100644
index 0000000..562725b
--- /dev/null
+++ b/src/Packager/Bundle/Program.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+public class Program {
+    public static void Main(string[] args){
+        System.Console.WriteLine("Hello world.");
+    }
+}
+
diff --git a/src/Packager/Packager.runtimeconfig.json b/src/Packager/Packager.runtimeconfig.json
deleted file mode 100644
index b3d95fb..0000000
--- a/src/Packager/Packager.runtimeconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "runtimeOptions": {
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "1.0.0-rc2-3002702"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Packager/Packager.xproj b/src/Packager/Packager.xproj
deleted file mode 100644
index 44f6165..0000000
--- a/src/Packager/Packager.xproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>45d76fd8-cd19-4e16-bd42-6bad177b9b79</ProjectGuid>
-    <RootNamespace>Packager</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-	"C:\program files\dotnet\dotnet.exe" publish .. -o ../../Microsoft.IIS.Administration/plugins
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Packager/Packager/Packager.csproj b/src/Packager/Packager/Packager.csproj
new file mode 100644
index 0000000..28b4658
--- /dev/null
+++ b/src/Packager/Packager/Packager.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Publish all of the core plugins for the Microsoft IIS Administration API</Description>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="dotnet.exe restore $(ProjectDir)..\Bundle" />
+  </Target>
+  <Target Name="PostPostBuild" AfterTargets="PostBuild">
+    <Exec Command="dotnet.exe publish $(ProjectDir)..\Bundle -o $(ProjectDir)..\..\Microsoft.IIS.Administration\plugins" />
+  </Target>
+</Project>
diff --git a/src/Packager/project.json b/src/Packager/project.json
deleted file mode 100644
index bc82630..0000000
--- a/src/Packager/project.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "description": "Bundles together all of the core plugins for the Microsoft IIS Administration API",
-  "buildOptions": {
-    "emitEntryPoint": false
-  },
-  "dependencies": {
-    "Microsoft.IIS.Administration.AccessManagement": "1.1.0",
-    "Microsoft.IIS.Administration.Certificates": "1.1.0",
-    "Microsoft.IIS.Administration.Files": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Applications": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.AppPools": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Authentication": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Authorization": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.CentralCertificates": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Compression": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.DefaultDocuments": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Delegation": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.DirectoryBrowsing": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Files": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Handlers": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.HttpRedirect": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.HttpRequestTracing": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.HttpResponseHeaders": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Info": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.IPRestrictions": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Logging": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Modules": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.RequestFiltering": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.RequestMonitor": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Scm": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.Sites": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.SslSettings": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.StaticContent": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.VirtualDirectories": "1.1.0",
-    "Microsoft.IIS.Administration.WebServer.WorkerProcesses": "1.1.0",
-    "Microsoft.NETCore.App": {
-      "version": "1.0.0",
-      "type": "platform"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  }
-}
diff --git a/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.csproj b/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.csproj
new file mode 100644
index 0000000..d1163f6
--- /dev/null
+++ b/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Tests Class Library</Description>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <Authors>Microsoft</Authors>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Microsoft.IIS.Administration.Tests</AssemblyName>
+    <PackageId>Microsoft.IIS.Administration.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json;test.config.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.IIS.Administration.WebServer\Microsoft.IIS.Administration.WebServer.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.IIS.Administration.WebServer.Files\Microsoft.IIS.Administration.WebServer.Files.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
+    <PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
+    <PackageReference Include="System.Net.NetworkInformation" Version="4.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.xproj b/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.xproj
deleted file mode 100644
index 1c490f0..0000000
--- a/test/Microsoft.IIS.Administration.Tests/Microsoft.IIS.Administration.Tests.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>61b68bc3-b92b-40d4-b8c0-b8c4a8c02ada</ProjectGuid>
-    <RootNamespace>Microsoft.IIS.Administration.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/test/Microsoft.IIS.Administration.Tests/project.json b/test/Microsoft.IIS.Administration.Tests/project.json
deleted file mode 100644
index 3f88dba..0000000
--- a/test/Microsoft.IIS.Administration.Tests/project.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "version": "1.1.0",
-  "description": "Tests Class Library",
-  "authors": [ "Microsoft" ],
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "testRunner": "xunit",
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.0.0"
-    },
-    "Microsoft.IIS.Administration.WebServer": "1.1.0",
-    "xunit": "2.2.0-beta2-build3300",
-    "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "Microsoft.IIS.Administration.WebServer.Files": "1.1.0",
-    "System.Net.NetworkInformation": "4.1.0"
-  },
-  "buildOptions": {
-    "copyToOutput": {
-      "include": [
-        "xunit.runner.json",
-        "test.config.json"
-      ]
-    }
-  }
-}
\ No newline at end of file