diff --git a/OpenIddict.sln b/OpenIddict.sln
index 1da4a2ab..d9c82fb6 100644
--- a/OpenIddict.sln
+++ b/OpenIddict.sln
@@ -25,9 +25,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OpenIddict.Mvc", "src\OpenI
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{DE26CC68-28BA-44BB-B28E-43B949C6C606}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NWebsec.Core", "external\NWebsec.Core\NWebsec.Core.xproj", "{E9575361-5C4B-425A-BCA5-0E8249C6C5FB}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NWebsec.Middleware", "external\NWebsec.Middleware\NWebsec.Middleware.xproj", "{38C8E88F-1D01-466F-B47D-6D67F13C1594}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NWebsec", "external\NWebsec\NWebsec.xproj", "{38C8E88F-1D01-466F-B47D-6D67F13C1594}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,10 +65,6 @@ Global
 		{7AE46E2F-E93B-4FF9-B941-6CD7A3E1BF84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AE46E2F-E93B-4FF9-B941-6CD7A3E1BF84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AE46E2F-E93B-4FF9-B941-6CD7A3E1BF84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9575361-5C4B-425A-BCA5-0E8249C6C5FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9575361-5C4B-425A-BCA5-0E8249C6C5FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9575361-5C4B-425A-BCA5-0E8249C6C5FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9575361-5C4B-425A-BCA5-0E8249C6C5FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{38C8E88F-1D01-466F-B47D-6D67F13C1594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{38C8E88F-1D01-466F-B47D-6D67F13C1594}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{38C8E88F-1D01-466F-B47D-6D67F13C1594}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -88,7 +82,6 @@ Global
 		{D2450929-ED0E-420D-B475-327924F9701C} = {D544447C-D701-46BB-9A5B-C76C612A596B}
 		{E60CF8CA-6313-4359-BE43-AFCBB927EA30} = {D544447C-D701-46BB-9A5B-C76C612A596B}
 		{7AE46E2F-E93B-4FF9-B941-6CD7A3E1BF84} = {D544447C-D701-46BB-9A5B-C76C612A596B}
-		{E9575361-5C4B-425A-BCA5-0E8249C6C5FB} = {DE26CC68-28BA-44BB-B28E-43B949C6C606}
 		{38C8E88F-1D01-466F-B47D-6D67F13C1594} = {DE26CC68-28BA-44BB-B28E-43B949C6C606}
 	EndGlobalSection
 EndGlobal
diff --git a/external/NWebsec.Core/NWebsec.Core.xproj b/external/NWebsec.Core/NWebsec.Core.xproj
deleted file mode 100644
index 30271d94..00000000
--- a/external/NWebsec.Core/NWebsec.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)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e9575361-5c4b-425a-bca5-0e8249c6c5fb</ProjectGuid>
-    <RootNamespace>NWebsec.Core</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </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/external/NWebsec.Core/project.json b/external/NWebsec.Core/project.json
deleted file mode 100644
index 03b3f8e6..00000000
--- a/external/NWebsec.Core/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-
-  "version": "2.0.0-gamma-custom-*",
-  "title": "NWebsec.Core (ASP.NET 5)",
-  "description": "This library provides core functionality for the NWebsec security libraries.",
-  "releaseNotes": "This release includes core functions for the NWebsec security libaries.",
-  "authors": [ "André N. Klingsheim" ],
-  "owners": [ "André N. Klingsheim" ],
-  "copyright": "Copyright © 2014 - 2015",
-  "tags": [ "NWebsec Security AspNet AppSec" ],
-  "projectUrl": "https://docs.nwebsec.com/en/latest/",
-  "licenseUrl": "https://github.com/NWebsec/NWebsec/blob/master/LICENSE",
-  "iconUrl": "https://klings.blob.core.windows.net/nwebsecicon/nwebsec_nuget.png",
-
-  "shared": "**/**.cs",
-  
-  "frameworks": {
-    "dnx451": { },
-    "net451": { },
-    "dotnet5.4": {
-      "dependencies": {
-        "Microsoft.CSharp": "4.0.1-*",
-        "System.Runtime": "4.0.21-*",
-        "System.Security.Cryptography.Algorithms": "4.0.0-*",
-        "System.Security.Cryptography.X509Certificates": "4.0.0-*",
-        "System.Text.RegularExpressions": "4.0.11-*"
-      }
-    }
-  },
-  "dependencies": {
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*"
-  }
-}
diff --git a/external/NWebsec.Middleware/ApplicationBuilderExtensions.cs b/external/NWebsec/ApplicationBuilderExtensions.cs
similarity index 100%
rename from external/NWebsec.Middleware/ApplicationBuilderExtensions.cs
rename to external/NWebsec/ApplicationBuilderExtensions.cs
diff --git a/external/NWebsec.Middleware/Core/OwinEnvironment.cs b/external/NWebsec/Core/OwinEnvironment.cs
similarity index 100%
rename from external/NWebsec.Middleware/Core/OwinEnvironment.cs
rename to external/NWebsec/Core/OwinEnvironment.cs
diff --git a/external/NWebsec.Middleware/Core/OwinKeys.cs b/external/NWebsec/Core/OwinKeys.cs
similarity index 100%
rename from external/NWebsec.Middleware/Core/OwinKeys.cs
rename to external/NWebsec/Core/OwinKeys.cs
diff --git a/external/NWebsec.Middleware/Core/RequestHeaders.cs b/external/NWebsec/Core/RequestHeaders.cs
similarity index 100%
rename from external/NWebsec.Middleware/Core/RequestHeaders.cs
rename to external/NWebsec/Core/RequestHeaders.cs
diff --git a/external/NWebsec.Middleware/Core/ResponseHeaders.cs b/external/NWebsec/Core/ResponseHeaders.cs
similarity index 100%
rename from external/NWebsec.Middleware/Core/ResponseHeaders.cs
rename to external/NWebsec/Core/ResponseHeaders.cs
diff --git a/external/NWebsec.Middleware/CspDirective.cs b/external/NWebsec/CspDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/CspDirective.cs
rename to external/NWebsec/CspDirective.cs
diff --git a/external/NWebsec.Middleware/CspDirectiveExtensions.cs b/external/NWebsec/CspDirectiveExtensions.cs
similarity index 100%
rename from external/NWebsec.Middleware/CspDirectiveExtensions.cs
rename to external/NWebsec/CspDirectiveExtensions.cs
diff --git a/external/NWebsec.Middleware/CspOptions.cs b/external/NWebsec/CspOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/CspOptions.cs
rename to external/NWebsec/CspOptions.cs
diff --git a/external/NWebsec.Middleware/CspReportUriDirective.cs b/external/NWebsec/CspReportUriDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/CspReportUriDirective.cs
rename to external/NWebsec/CspReportUriDirective.cs
diff --git a/external/NWebsec.Core/Exceptions/RedirectValidationException.cs b/external/NWebsec/Exceptions/RedirectValidationException.cs
similarity index 100%
rename from external/NWebsec.Core/Exceptions/RedirectValidationException.cs
rename to external/NWebsec/Exceptions/RedirectValidationException.cs
diff --git a/external/NWebsec.Core/Extensions/HttpContextExtensions.cs b/external/NWebsec/Extensions/HttpContextExtensions.cs
similarity index 100%
rename from external/NWebsec.Core/Extensions/HttpContextExtensions.cs
rename to external/NWebsec/Extensions/HttpContextExtensions.cs
diff --git a/external/NWebsec.Core/Fluent/IFluentInterface.cs b/external/NWebsec/Fluent/IFluentInterface.cs
similarity index 100%
rename from external/NWebsec.Core/Fluent/IFluentInterface.cs
rename to external/NWebsec/Fluent/IFluentInterface.cs
diff --git a/external/NWebsec.Middleware/FluentCspPluginTypesDirective.cs b/external/NWebsec/FluentCspPluginTypesDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/FluentCspPluginTypesDirective.cs
rename to external/NWebsec/FluentCspPluginTypesDirective.cs
diff --git a/external/NWebsec.Middleware/FluentCspSandboxDirective.cs b/external/NWebsec/FluentCspSandboxDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/FluentCspSandboxDirective.cs
rename to external/NWebsec/FluentCspSandboxDirective.cs
diff --git a/external/NWebsec.Middleware/Helpers/CspUpgradeHelper.cs b/external/NWebsec/Helpers/CspUpgradeHelper.cs
similarity index 100%
rename from external/NWebsec.Middleware/Helpers/CspUpgradeHelper.cs
rename to external/NWebsec/Helpers/CspUpgradeHelper.cs
diff --git a/external/NWebsec.Core/Helpers/HeaderResultHandler.cs b/external/NWebsec/Helpers/HeaderResultHandler.cs
similarity index 100%
rename from external/NWebsec.Core/Helpers/HeaderResultHandler.cs
rename to external/NWebsec/Helpers/HeaderResultHandler.cs
diff --git a/external/NWebsec.Core/Helpers/IHeaderResultHandler.cs b/external/NWebsec/Helpers/IHeaderResultHandler.cs
similarity index 100%
rename from external/NWebsec.Core/Helpers/IHeaderResultHandler.cs
rename to external/NWebsec/Helpers/IHeaderResultHandler.cs
diff --git a/external/NWebsec.Core/Helpers/X509/TlvTripletHeader.cs b/external/NWebsec/Helpers/X509/TlvTripletHeader.cs
similarity index 100%
rename from external/NWebsec.Core/Helpers/X509/TlvTripletHeader.cs
rename to external/NWebsec/Helpers/X509/TlvTripletHeader.cs
diff --git a/external/NWebsec.Core/Helpers/X509/X509Helper.cs b/external/NWebsec/Helpers/X509/X509Helper.cs
similarity index 100%
rename from external/NWebsec.Core/Helpers/X509/X509Helper.cs
rename to external/NWebsec/Helpers/X509/X509Helper.cs
diff --git a/external/NWebsec.Middleware/HpkpOptions.cs b/external/NWebsec/HpkpOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/HpkpOptions.cs
rename to external/NWebsec/HpkpOptions.cs
diff --git a/external/NWebsec.Middleware/HpkpOptionsConfiguration.cs b/external/NWebsec/HpkpOptionsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Middleware/HpkpOptionsConfiguration.cs
rename to external/NWebsec/HpkpOptionsConfiguration.cs
diff --git a/external/NWebsec.Middleware/HstsOptions.cs b/external/NWebsec/HstsOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/HstsOptions.cs
rename to external/NWebsec/HstsOptions.cs
diff --git a/external/NWebsec.Middleware/HstsOptionsConfiguration.cs b/external/NWebsec/HstsOptionsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Middleware/HstsOptionsConfiguration.cs
rename to external/NWebsec/HstsOptionsConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspHeaderConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspHeaderConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspHeaderConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspHeaderConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspPluginTypesDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspPluginTypesDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspPluginTypesDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspPluginTypesDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspReportUriDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspReportUriDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspReportUriDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspReportUriDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspSandboxDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspSandboxDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspSandboxDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspSandboxDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/CspUpgradeDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/CspUpgradeDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/CspUpgradeDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/CspUpgradeDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/HpkpConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/HpkpConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/HpkpConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/HpkpConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/HstsConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/HstsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/HstsConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/HstsConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveBasicConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspDirectiveBasicConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveBasicConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspDirectiveBasicConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveUnsafeInlineConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspDirectiveUnsafeInlineConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspDirectiveUnsafeInlineConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspDirectiveUnsafeInlineConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspHeaderConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspHeaderConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspHeaderConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspHeaderConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspPluginTypesDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspPluginTypesDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspPluginTypesDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspPluginTypesDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspReportUriDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspReportUriDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspReportUriDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspReportUriDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspSandboxDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspSandboxDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspSandboxDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspSandboxDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ICspUpgradeDirectiveConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ICspUpgradeDirectiveConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ICspUpgradeDirectiveConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ICspUpgradeDirectiveConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IHpkpCertConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IHpkpCertConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IHpkpCertConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IHpkpCertConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IHpkpConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IHpkpConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IHpkpConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IHpkpConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IHpkpPinConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IHpkpPinConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IHpkpPinConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IHpkpPinConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IHstsConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IHstsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IHstsConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IHstsConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IRedirectValidationConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IRedirectValidationConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IRedirectValidationConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IRedirectValidationConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ISameHostHttpsRedirectConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ISameHostHttpsRedirectConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ISameHostHttpsRedirectConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ISameHostHttpsRedirectConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/ISimpleBooleanConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/ISimpleBooleanConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/ISimpleBooleanConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/ISimpleBooleanConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IXFrameOptionsConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IXFrameOptionsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IXFrameOptionsConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IXFrameOptionsConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IXRobotsTagConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IXRobotsTagConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IXRobotsTagConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IXRobotsTagConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/IXXssProtectionConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/IXXssProtectionConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/IXXssProtectionConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/IXXssProtectionConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/RedirectValidationConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/RedirectValidationConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/RedirectValidationConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/RedirectValidationConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/SameHostHttpsRedirectConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/SameHostHttpsRedirectConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/SameHostHttpsRedirectConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/SameHostHttpsRedirectConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/SimpleBooleanConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/SimpleBooleanConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/SimpleBooleanConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/SimpleBooleanConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/Validation/HpkpConfigurationValidator.cs b/external/NWebsec/HttpHeaders/Configuration/Validation/HpkpConfigurationValidator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/Validation/HpkpConfigurationValidator.cs
rename to external/NWebsec/HttpHeaders/Configuration/Validation/HpkpConfigurationValidator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/Validation/HstsConfigurationValidator.cs b/external/NWebsec/HttpHeaders/Configuration/Validation/HstsConfigurationValidator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/Validation/HstsConfigurationValidator.cs
rename to external/NWebsec/HttpHeaders/Configuration/Validation/HstsConfigurationValidator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/Validation/Rfc2045MediaTypeValidator.cs b/external/NWebsec/HttpHeaders/Configuration/Validation/Rfc2045MediaTypeValidator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/Validation/Rfc2045MediaTypeValidator.cs
rename to external/NWebsec/HttpHeaders/Configuration/Validation/Rfc2045MediaTypeValidator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/Validation/XRobotsTagConfigurationValidator.cs b/external/NWebsec/HttpHeaders/Configuration/Validation/XRobotsTagConfigurationValidator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/Validation/XRobotsTagConfigurationValidator.cs
rename to external/NWebsec/HttpHeaders/Configuration/Validation/XRobotsTagConfigurationValidator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/XFrameOptionsConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/XFrameOptionsConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/XFrameOptionsConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/XFrameOptionsConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/XRobotsTagConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/XRobotsTagConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/XRobotsTagConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/XRobotsTagConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Configuration/XXssProtectionConfiguration.cs b/external/NWebsec/HttpHeaders/Configuration/XXssProtectionConfiguration.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Configuration/XXssProtectionConfiguration.cs
rename to external/NWebsec/HttpHeaders/Configuration/XXssProtectionConfiguration.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Csp/CspSourceParseResult.cs b/external/NWebsec/HttpHeaders/Csp/CspSourceParseResult.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Csp/CspSourceParseResult.cs
rename to external/NWebsec/HttpHeaders/Csp/CspSourceParseResult.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Csp/CspUriSource.cs b/external/NWebsec/HttpHeaders/Csp/CspUriSource.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Csp/CspUriSource.cs
rename to external/NWebsec/HttpHeaders/Csp/CspUriSource.cs
diff --git a/external/NWebsec.Core/HttpHeaders/Csp/InvalidCspSourceException.cs b/external/NWebsec/HttpHeaders/Csp/InvalidCspSourceException.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/Csp/InvalidCspSourceException.cs
rename to external/NWebsec/HttpHeaders/Csp/InvalidCspSourceException.cs
diff --git a/external/NWebsec.Core/HttpHeaders/HeaderConstants.cs b/external/NWebsec/HttpHeaders/HeaderConstants.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/HeaderConstants.cs
rename to external/NWebsec/HttpHeaders/HeaderConstants.cs
diff --git a/external/NWebsec.Core/HttpHeaders/HeaderGenerator.cs b/external/NWebsec/HttpHeaders/HeaderGenerator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/HeaderGenerator.cs
rename to external/NWebsec/HttpHeaders/HeaderGenerator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/HeaderResult.cs b/external/NWebsec/HttpHeaders/HeaderResult.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/HeaderResult.cs
rename to external/NWebsec/HttpHeaders/HeaderResult.cs
diff --git a/external/NWebsec.Core/HttpHeaders/IHeaderGenerator.cs b/external/NWebsec/HttpHeaders/IHeaderGenerator.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/IHeaderGenerator.cs
rename to external/NWebsec/HttpHeaders/IHeaderGenerator.cs
diff --git a/external/NWebsec.Core/HttpHeaders/XXssPolicy.cs b/external/NWebsec/HttpHeaders/XXssPolicy.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/XXssPolicy.cs
rename to external/NWebsec/HttpHeaders/XXssPolicy.cs
diff --git a/external/NWebsec.Core/HttpHeaders/XfoPolicy.cs b/external/NWebsec/HttpHeaders/XfoPolicy.cs
similarity index 100%
rename from external/NWebsec.Core/HttpHeaders/XfoPolicy.cs
rename to external/NWebsec/HttpHeaders/XfoPolicy.cs
diff --git a/external/NWebsec.Middleware/IFluentCspOptions.cs b/external/NWebsec/IFluentCspOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentCspOptions.cs
rename to external/NWebsec/IFluentCspOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentCspPluginTypesDirective.cs b/external/NWebsec/IFluentCspPluginTypesDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentCspPluginTypesDirective.cs
rename to external/NWebsec/IFluentCspPluginTypesDirective.cs
diff --git a/external/NWebsec.Middleware/IFluentCspReportUriDirective.cs b/external/NWebsec/IFluentCspReportUriDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentCspReportUriDirective.cs
rename to external/NWebsec/IFluentCspReportUriDirective.cs
diff --git a/external/NWebsec.Middleware/IFluentCspSandboxDirective.cs b/external/NWebsec/IFluentCspSandboxDirective.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentCspSandboxDirective.cs
rename to external/NWebsec/IFluentCspSandboxDirective.cs
diff --git a/external/NWebsec.Middleware/IFluentHpkpOptions.cs b/external/NWebsec/IFluentHpkpOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentHpkpOptions.cs
rename to external/NWebsec/IFluentHpkpOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentHstsOptions.cs b/external/NWebsec/IFluentHstsOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentHstsOptions.cs
rename to external/NWebsec/IFluentHstsOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentRedirectValidationOptions.cs b/external/NWebsec/IFluentRedirectValidationOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentRedirectValidationOptions.cs
rename to external/NWebsec/IFluentRedirectValidationOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentXFrameOptions.cs b/external/NWebsec/IFluentXFrameOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentXFrameOptions.cs
rename to external/NWebsec/IFluentXFrameOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentXRobotsTagOptions.cs b/external/NWebsec/IFluentXRobotsTagOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentXRobotsTagOptions.cs
rename to external/NWebsec/IFluentXRobotsTagOptions.cs
diff --git a/external/NWebsec.Middleware/IFluentXXssProtectionOptions.cs b/external/NWebsec/IFluentXXssProtectionOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/IFluentXXssProtectionOptions.cs
rename to external/NWebsec/IFluentXXssProtectionOptions.cs
diff --git a/external/NWebsec.Middleware/Middleware/CspMiddleware.cs b/external/NWebsec/Middleware/CspMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/CspMiddleware.cs
rename to external/NWebsec/Middleware/CspMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/HpkpMiddleware.cs b/external/NWebsec/Middleware/HpkpMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/HpkpMiddleware.cs
rename to external/NWebsec/Middleware/HpkpMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/HstsMiddleware.cs b/external/NWebsec/Middleware/HstsMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/HstsMiddleware.cs
rename to external/NWebsec/Middleware/HstsMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/MiddleWareBase.cs b/external/NWebsec/Middleware/MiddleWareBase.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/MiddleWareBase.cs
rename to external/NWebsec/Middleware/MiddleWareBase.cs
diff --git a/external/NWebsec.Middleware/Middleware/RedirectValidationMiddleware.cs b/external/NWebsec/Middleware/RedirectValidationMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/RedirectValidationMiddleware.cs
rename to external/NWebsec/Middleware/RedirectValidationMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/XContentTypeOptionsMiddleware.cs b/external/NWebsec/Middleware/XContentTypeOptionsMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/XContentTypeOptionsMiddleware.cs
rename to external/NWebsec/Middleware/XContentTypeOptionsMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/XDownloadOptionsMiddleware.cs b/external/NWebsec/Middleware/XDownloadOptionsMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/XDownloadOptionsMiddleware.cs
rename to external/NWebsec/Middleware/XDownloadOptionsMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/XRobotsTagMiddleware.cs b/external/NWebsec/Middleware/XRobotsTagMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/XRobotsTagMiddleware.cs
rename to external/NWebsec/Middleware/XRobotsTagMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/XXssMiddleware.cs b/external/NWebsec/Middleware/XXssMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/XXssMiddleware.cs
rename to external/NWebsec/Middleware/XXssMiddleware.cs
diff --git a/external/NWebsec.Middleware/Middleware/XfoMiddleware.cs b/external/NWebsec/Middleware/XfoMiddleware.cs
similarity index 100%
rename from external/NWebsec.Middleware/Middleware/XfoMiddleware.cs
rename to external/NWebsec/Middleware/XfoMiddleware.cs
diff --git a/external/NWebsec.Middleware/NWebsec.Middleware.xproj b/external/NWebsec/NWebsec.xproj
similarity index 100%
rename from external/NWebsec.Middleware/NWebsec.Middleware.xproj
rename to external/NWebsec/NWebsec.xproj
diff --git a/external/NWebsec.Core/NWebsecContext.cs b/external/NWebsec/NWebsecContext.cs
similarity index 100%
rename from external/NWebsec.Core/NWebsecContext.cs
rename to external/NWebsec/NWebsecContext.cs
diff --git a/external/NWebsec.Middleware/RedirectValidationOptions.cs b/external/NWebsec/RedirectValidationOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/RedirectValidationOptions.cs
rename to external/NWebsec/RedirectValidationOptions.cs
diff --git a/external/NWebsec.Core/RedirectValidator.cs b/external/NWebsec/RedirectValidator.cs
similarity index 100%
rename from external/NWebsec.Core/RedirectValidator.cs
rename to external/NWebsec/RedirectValidator.cs
diff --git a/external/NWebsec.Middleware/XFrameOptions.cs b/external/NWebsec/XFrameOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/XFrameOptions.cs
rename to external/NWebsec/XFrameOptions.cs
diff --git a/external/NWebsec.Middleware/XRobotsTagOptions.cs b/external/NWebsec/XRobotsTagOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/XRobotsTagOptions.cs
rename to external/NWebsec/XRobotsTagOptions.cs
diff --git a/external/NWebsec.Middleware/XXssProtectionOptions.cs b/external/NWebsec/XXssProtectionOptions.cs
similarity index 100%
rename from external/NWebsec.Middleware/XXssProtectionOptions.cs
rename to external/NWebsec/XXssProtectionOptions.cs
diff --git a/external/NWebsec.Middleware/project.json b/external/NWebsec/project.json
similarity index 88%
rename from external/NWebsec.Middleware/project.json
rename to external/NWebsec/project.json
index 3e6a613e..11e63a01 100644
--- a/external/NWebsec.Middleware/project.json
+++ b/external/NWebsec/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-gamma-custom-*",
+  "version": "1.0.0-internal-*",
   "title": "NWebsec.Middleware (ASP.NET 5)",
   "description": "NWebsec middleware for ASP.NET 5 applications. NWebsec helps you set important security headers and detect potentially dangerous redirects. See project website for documentation.",
   "releaseNotes": "This release includes core functions for the NWebsec security libaries.",
@@ -25,7 +25,6 @@
 
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-rc2-*",
-    "NWebsec.Core": "2.0.0-gamma-*"
+    "Microsoft.AspNet.Http.Abstractions": "1.0.0-rc2-*"
   }
 }
diff --git a/src/OpenIddict.Mvc/project.json b/src/OpenIddict.Mvc/project.json
index 715c5d97..1c117790 100644
--- a/src/OpenIddict.Mvc/project.json
+++ b/src/OpenIddict.Mvc/project.json
@@ -17,9 +17,10 @@
             "version": "1.0.0-*"
         },
 
-        "NWebsec.Middleware": {
+        "NWebsec": {
             "type": "build",
-            "version": "1.0.0-gamma-custom-*"
+            "version": "1.0.0-internal-*",
+            "target": "project"
         },
 
         "OpenIddict.Core": "1.0.0-*"