diff --git a/BFF/v3/Angular/angular.ssr/package-lock.json b/BFF/v3/Angular/angular.ssr/package-lock.json
index 753859e0..ea24090c 100644
--- a/BFF/v3/Angular/angular.ssr/package-lock.json
+++ b/BFF/v3/Angular/angular.ssr/package-lock.json
@@ -539,7 +539,6 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.2.tgz",
       "integrity": "sha512-tLb4/gAjy1WFYZd68FnwLaC8w3b10RG8r+x5MUnbyhJa9K3qILzF8gWUVJ4tKLKentB3fWPWPNs9OFZH5XVf1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -556,7 +555,6 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.2.tgz",
       "integrity": "sha512-Aa5BTaSC6QInjiyTrjfTElKYC07trozdWuPhdG6JiwSAZ/ryQDzMLayHQ+MJSq3TsvpwNd+ld86RK0ARRSmJbA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -578,7 +576,6 @@
       "integrity": "sha512-RPUSZGf1wnSyDkwt3pZ0W/m3e3+vM1PwdgLpV5OGGJSki0VtNFp2xlnCpwrF/EDPJk2kLBj7nQADfB/P5lX9eA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "7.26.9",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -655,7 +652,6 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.2.tgz",
       "integrity": "sha512-RL2wxk62BREW4sksnBSjtBDgPxHqIJQKkrlxXbbu2jZql7xohEQtdTZP3DB6iWnZLYgz8CAfTzyaHMvj6HfdLg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -690,7 +686,6 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.2.tgz",
       "integrity": "sha512-D15zwFiOczbPhJrdCgbuZwSDwQb6uyDjM5YI3SgIFIxP2JiVdBg3AvmqoJQOuU8ntMeeiOxtdl8nqcvUddhdPw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -731,7 +726,6 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-19.2.2.tgz",
       "integrity": "sha512-CMhgOdyT2OWGHokTKAn5jQHATeE3JHA/OYo55FRcLbTB39YRGFUBKcZCg7Vy4kMja45nTp0D3oHyiTeyoopRyQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0",
         "xhr2": "^0.2.0"
@@ -752,7 +746,6 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.2.tgz",
       "integrity": "sha512-H0JEN1cs7uX++piCyT2gfhgqONceCKbRRZq+zr1T61c5heAi2pBGHuuZnU0D1d0sgA82CGcWFrTduUJg5wWamw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -771,7 +764,6 @@
       "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-19.2.3.tgz",
       "integrity": "sha512-pv6XaFpFwlkgojDSppDriRLxEoUM/JKCnHu/UlZq0pDYZ55sC0YeyGkq2AbdorKFJpISwc3U3ZQbXiLussvxew==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -818,7 +810,6 @@
       "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.2",
@@ -3035,7 +3026,6 @@
       "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@inquirer/checkbox": "^4.1.2",
         "@inquirer/confirm": "^5.1.6",
@@ -5156,7 +5146,6 @@
       "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -5521,7 +5510,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -6000,7 +5988,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -8975,8 +8962,7 @@
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.6.0.tgz",
       "integrity": "sha512-niVlkeYVRwKFpmfWg6suo6H9CrNnydfBLEqefM5UjibYS+UoTjZdmvPJSiuyrRLGnFj1eYRhFd/ch+5hSlsFVA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/jest-worker": {
       "version": "27.5.1",
@@ -9015,7 +9001,6 @@
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -9123,7 +9108,6 @@
       "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
@@ -9482,7 +9466,6 @@
       "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "copy-anything": "^2.0.1",
         "parse-node-version": "^1.0.1",
@@ -11444,7 +11427,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -12100,7 +12082,6 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
       "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -12155,7 +12136,6 @@
       "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -13279,7 +13259,6 @@
       "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -13414,8 +13393,7 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/tuf-js": {
       "version": "3.0.1",
@@ -13471,7 +13449,6 @@
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -13709,6 +13686,7 @@
       "integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "postcss": "^8.5.3",
@@ -13795,6 +13773,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -13862,7 +13841,6 @@
       "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -13940,7 +13918,6 @@
       "integrity": "sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
@@ -14525,8 +14502,7 @@
       "version": "0.15.0",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz",
       "integrity": "sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     }
   }
 }
diff --git a/IdentityServer/v7/Basics/Apis/README.md b/IdentityServer/v7/Apis/README.md
similarity index 100%
rename from IdentityServer/v7/Basics/Apis/README.md
rename to IdentityServer/v7/Apis/README.md
diff --git a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/IdentityController.cs b/IdentityServer/v7/Apis/ResourceBasedApi/IdentityController.cs
similarity index 100%
rename from IdentityServer/v7/Basics/Apis/ResourceBasedApi/IdentityController.cs
rename to IdentityServer/v7/Apis/ResourceBasedApi/IdentityController.cs
diff --git a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/Program.cs b/IdentityServer/v7/Apis/ResourceBasedApi/Program.cs
similarity index 94%
rename from IdentityServer/v7/Basics/Apis/ResourceBasedApi/Program.cs
rename to IdentityServer/v7/Apis/ResourceBasedApi/Program.cs
index c4d3b951..15c6bc03 100755
--- a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/Program.cs
+++ b/IdentityServer/v7/Apis/ResourceBasedApi/Program.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System;
-using Client;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using ResourceBasedApi;
@@ -32,7 +31,7 @@
     // JWT tokens
     .AddJwtBearer("token", options =>
     {
-        options.Authority = Urls.IdentityServer;
+        options.Authority = "https://localhost:5001";
         options.Audience = "resource2";
 
         options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
@@ -44,7 +43,7 @@
     // reference tokens
     .AddOAuth2Introspection("introspection", options =>
     {
-        options.Authority = Urls.IdentityServer;
+        options.Authority = "https://localhost:5001";
 
         options.ClientId = "resource1";
         options.ClientSecret = "secret";
diff --git a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/Properties/launchSettings.json b/IdentityServer/v7/Apis/ResourceBasedApi/Properties/launchSettings.json
similarity index 100%
rename from IdentityServer/v7/Basics/Apis/ResourceBasedApi/Properties/launchSettings.json
rename to IdentityServer/v7/Apis/ResourceBasedApi/Properties/launchSettings.json
diff --git a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/ResourceBasedApi.csproj b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj
similarity index 77%
rename from IdentityServer/v7/Basics/Apis/ResourceBasedApi/ResourceBasedApi.csproj
rename to IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj
index e63f1f3f..bfec9cd8 100755
--- a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/ResourceBasedApi.csproj
+++ b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj
@@ -12,10 +12,4 @@
   </ItemGroup>
 
   <!-- Constants and helpers -->
-  <ItemGroup>
-    <Compile Include="..\..\Shared\Constants.cs">
-      <Link>Shared\Constants.cs</Link>
-    </Compile>
-
-  </ItemGroup>
 </Project>
diff --git a/IdentityServer/v7/Basics/Apis/ResourceBasedApi/Selector.cs b/IdentityServer/v7/Apis/ResourceBasedApi/Selector.cs
similarity index 100%
rename from IdentityServer/v7/Basics/Apis/ResourceBasedApi/Selector.cs
rename to IdentityServer/v7/Apis/ResourceBasedApi/Selector.cs
diff --git a/IdentityServer/v7/Basics/Apis/SimpleApi/IdentityController.cs b/IdentityServer/v7/Apis/SimpleApi/IdentityController.cs
similarity index 100%
rename from IdentityServer/v7/Basics/Apis/SimpleApi/IdentityController.cs
rename to IdentityServer/v7/Apis/SimpleApi/IdentityController.cs
diff --git a/IdentityServer/v7/Basics/Apis/SimpleApi/Program.cs b/IdentityServer/v7/Apis/SimpleApi/Program.cs
similarity index 95%
rename from IdentityServer/v7/Basics/Apis/SimpleApi/Program.cs
rename to IdentityServer/v7/Apis/SimpleApi/Program.cs
index 96fd4008..4e550d0d 100755
--- a/IdentityServer/v7/Basics/Apis/SimpleApi/Program.cs
+++ b/IdentityServer/v7/Apis/SimpleApi/Program.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Client;
 using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
@@ -26,7 +25,7 @@
 builder.Services.AddAuthentication("token")
     .AddJwtBearer("token", options =>
     {
-        options.Authority = Urls.IdentityServer;
+        options.Authority = "https://localhost:5001";
         options.TokenValidationParameters.ValidateAudience = false;
 
         options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
diff --git a/IdentityServer/v7/Basics/Apis/SimpleApi/Properties/launchSettings.json b/IdentityServer/v7/Apis/SimpleApi/Properties/launchSettings.json
similarity index 90%
rename from IdentityServer/v7/Basics/Apis/SimpleApi/Properties/launchSettings.json
rename to IdentityServer/v7/Apis/SimpleApi/Properties/launchSettings.json
index eedda964..0b83cc3a 100755
--- a/IdentityServer/v7/Basics/Apis/SimpleApi/Properties/launchSettings.json
+++ b/IdentityServer/v7/Apis/SimpleApi/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "Api": {
+    "SelfHost": {
       "commandName": "Project",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -8,4 +8,4 @@
       "applicationUrl": "https://localhost:5002"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/IdentityServer/v7/Basics/Apis/SimpleApi/SimpleApi.csproj b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj
similarity index 75%
rename from IdentityServer/v7/Basics/Apis/SimpleApi/SimpleApi.csproj
rename to IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj
index 13f563f9..9c02fbde 100755
--- a/IdentityServer/v7/Basics/Apis/SimpleApi/SimpleApi.csproj
+++ b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj
@@ -11,10 +11,5 @@
   </ItemGroup>
 
   <!-- Constants and helpers -->
-  <ItemGroup>
-    <Compile Include="..\..\Shared\Constants.cs">
-      <Link>Shared\Constants.cs</Link>
-    </Compile>
-  </ItemGroup>
 
 </Project>
diff --git a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
index e43183e0..bdabce70 100755
--- a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
+++ b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{231602F3-72FC-4D10-9BB8-90FCCF662DF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{62EB4A12-0868-4770-A63C-14FA07F0BF5C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{2538D8F8-8265-4C96-9888-DA03306C1CC2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,18 +34,6 @@ Global
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x64.Build.0 = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.ActiveCfg = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -58,18 +46,30 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x64.Build.0 = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x64.ActiveCfg = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x64.Build.0 = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{62EB4A12-0868-4770-A63C-14FA07F0BF5C}.Release|x86.Build.0 = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x64.Build.0 = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{2538D8F8-8265-4C96-9888-DA03306C1CC2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/Introspection/Introspection.sln b/IdentityServer/v7/Basics/Introspection/Introspection.sln
index dda95763..c385d34f 100755
--- a/IdentityServer/v7/Basics/Introspection/Introspection.sln
+++ b/IdentityServer/v7/Basics/Introspection/Introspection.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{231602F3-72FC-4D10-9BB8-90FCCF662DF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{6257F3CF-8198-4861-9080-8C9FA8230BD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceBasedApi", "..\Apis\ResourceBasedApi\ResourceBasedApi.csproj", "{06672456-FD48-4217-831B-49119EC6554D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceBasedApi", "..\..\Apis\ResourceBasedApi\ResourceBasedApi.csproj", "{47794C35-D331-44C8-B54C-A8EFC6D15147}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,18 +34,6 @@ Global
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x64.Build.0 = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.ActiveCfg = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -58,18 +46,30 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|x64.Build.0 = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Debug|x86.Build.0 = Debug|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|x64.ActiveCfg = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|x64.Build.0 = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|x86.ActiveCfg = Release|Any CPU
-		{06672456-FD48-4217-831B-49119EC6554D}.Release|x86.Build.0 = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|x64.Build.0 = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Debug|x86.Build.0 = Debug|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|x64.ActiveCfg = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|x64.Build.0 = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{6257F3CF-8198-4861-9080-8C9FA8230BD5}.Release|x86.Build.0 = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|x64.Build.0 = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Debug|x86.Build.0 = Debug|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|x64.ActiveCfg = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|x64.Build.0 = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|x86.ActiveCfg = Release|Any CPU
+		{47794C35-D331-44C8-B54C-A8EFC6D15147}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
index e43183e0..ec3df387 100755
--- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{231602F3-72FC-4D10-9BB8-90FCCF662DF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{2FFA2095-2B2F-4909-8AF8-FED77643D661}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,18 +34,6 @@ Global
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x64.Build.0 = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.ActiveCfg = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Release|x86.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -58,18 +46,30 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|x64.Build.0 = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Debug|x86.Build.0 = Debug|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|x64.ActiveCfg = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|x64.Build.0 = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|x86.ActiveCfg = Release|Any CPU
+		{2FFA2095-2B2F-4909-8AF8-FED77643D661}.Release|x86.Build.0 = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x64.Build.0 = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EDD6C722-B3D3-4414-A05B-D8AFA624DB3C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
index e978bfcb..753cac24 100755
--- a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
+++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{CA0B678A-AB8A-4917-B58B-2779D1D74C45}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{131A8C1E-C9F0-46FA-9B44-C234E2173429}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,18 +22,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -46,18 +34,6 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +46,30 @@ Global
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x64.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.Build.0 = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|x64.Build.0 = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA0B678A-AB8A-4917-B58B-2779D1D74C45}.Release|x86.Build.0 = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|x64.Build.0 = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Debug|x86.Build.0 = Debug|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x64.ActiveCfg = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x64.Build.0 = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.ActiveCfg = Release|Any CPU
+		{131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
index e978bfcb..6c91b431 100755
--- a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
+++ b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{31DE04B0-A96D-460A-83DB-D56F563A26C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{4C432499-3659-4D5F-868C-C8273D16462F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,18 +22,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -46,18 +34,6 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +46,30 @@ Global
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x64.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.Build.0 = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|x64.Build.0 = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{31DE04B0-A96D-460A-83DB-D56F563A26C7}.Release|x86.Build.0 = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|x64.Build.0 = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.ActiveCfg = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.Build.0 = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
index e978bfcb..fb2723fa 100755
--- a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
+++ b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{7BCF45DF-B314-48E0-86A1-90886840804A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,18 +22,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -46,18 +34,6 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +46,30 @@ Global
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x64.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.Build.0 = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|x64.Build.0 = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Debug|x86.Build.0 = Debug|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|x64.ActiveCfg = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|x64.Build.0 = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{8B19E09A-A5DB-492A-88A2-AEBE58BAEAEE}.Release|x86.Build.0 = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Debug|x86.Build.0 = Debug|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|x64.ActiveCfg = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|x64.Build.0 = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|x86.ActiveCfg = Release|Any CPU
+		{7BCF45DF-B314-48E0-86A1-90886840804A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/MvcPar/MvcPar.sln b/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
index d69276d6..82b7b027 100644
--- a/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
+++ b/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "src\Client.csproj", "{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{5F6BD9CA-DC99-4085-88E3-7FDF8D60903E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{44F9FF5C-87F4-4CB9-8175-4E3D39328702}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{48D8CF98-12BF-4700-8727-61996C498A0A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{FBD7DB82-BFB4-46BB-89C1-31F40939D922}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ Global
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F6BD9CA-DC99-4085-88E3-7FDF8D60903E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F6BD9CA-DC99-4085-88E3-7FDF8D60903E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F6BD9CA-DC99-4085-88E3-7FDF8D60903E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F6BD9CA-DC99-4085-88E3-7FDF8D60903E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48D8CF98-12BF-4700-8727-61996C498A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48D8CF98-12BF-4700-8727-61996C498A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48D8CF98-12BF-4700-8727-61996C498A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48D8CF98-12BF-4700-8727-61996C498A0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44F9FF5C-87F4-4CB9-8175-4E3D39328702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44F9FF5C-87F4-4CB9-8175-4E3D39328702}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44F9FF5C-87F4-4CB9-8175-4E3D39328702}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44F9FF5C-87F4-4CB9-8175-4E3D39328702}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBD7DB82-BFB4-46BB-89C1-31F40939D922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBD7DB82-BFB4-46BB-89C1-31F40939D922}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBD7DB82-BFB4-46BB-89C1-31F40939D922}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBD7DB82-BFB4-46BB-89C1-31F40939D922}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
index e978bfcb..a9370699 100755
--- a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
+++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\IdentityServer\src\IdentityServerHost.csproj", "{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{2174B90F-1AD4-458D-AF9F-93FE5EF77184}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client.csproj", "{62493CA0-0872-4C10-AE75-1D2590B027EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,18 +22,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x64.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Debug|x86.Build.0 = Debug|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x64.Build.0 = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.ActiveCfg = Release|Any CPU
-		{40EC0D82-FE0F-4F38-AB58-C25B0FC0102F}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -46,18 +34,6 @@ Global
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x64.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Debug|x86.Build.0 = Debug|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x64.Build.0 = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.ActiveCfg = Release|Any CPU
-		{12E10AE2-85D2-4110-8C33-4F2CFC849BF2}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -70,6 +46,30 @@ Global
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x64.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Release|x86.Build.0 = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|x64.Build.0 = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Debug|x86.Build.0 = Debug|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|x64.ActiveCfg = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|x64.Build.0 = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|x86.ActiveCfg = Release|Any CPU
+		{2174B90F-1AD4-458D-AF9F-93FE5EF77184}.Release|x86.Build.0 = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|x64.Build.0 = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Debug|x86.Build.0 = Debug|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x64.ActiveCfg = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x64.Build.0 = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.ActiveCfg = Release|Any CPU
+		{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
diff --git a/IdentityServer/v7/Basics/IdentityServer/IdentityServer.sln b/IdentityServer/v7/IdentityServerHost/IdentityServer.sln
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/IdentityServer.sln
rename to IdentityServer/v7/IdentityServerHost/IdentityServer.sln
diff --git a/IdentityServer/v7/Basics/IdentityServer/README.md b/IdentityServer/v7/IdentityServerHost/README.md
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/README.md
rename to IdentityServer/v7/IdentityServerHost/README.md
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Clients.cs b/IdentityServer/v7/IdentityServerHost/src/Clients.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Clients.cs
rename to IdentityServer/v7/IdentityServerHost/src/Clients.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/HostingExtensions.cs b/IdentityServer/v7/IdentityServerHost/src/HostingExtensions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/HostingExtensions.cs
rename to IdentityServer/v7/IdentityServerHost/src/HostingExtensions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/IdentityServerHost.csproj b/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/IdentityServerHost.csproj
rename to IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/AccessDenied.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/AccessDenied.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/AccessDenied.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/AccessDenied.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/AccessDenied.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/AccessDenied.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/AccessDenied.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/InputModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/InputModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/InputModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/InputModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/LoginOptions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/LoginOptions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/LoginOptions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/LoginOptions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Login/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Login/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOut.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOut.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOut.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOut.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOut.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOut.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOut.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOut.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOutViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOutViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LoggedOutViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LoggedOutViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LogoutOptions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LogoutOptions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Account/Logout/LogoutOptions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Account/Logout/LogoutOptions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/All.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/All.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/All.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/All.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/All.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/All.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/All.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/All.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Consent.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Consent.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Consent.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Consent.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Consent.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Consent.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Consent.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Consent.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/ConsentOptions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/ConsentOptions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/ConsentOptions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/ConsentOptions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/InputModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/InputModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/InputModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/InputModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/_ScopeListItem.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/_ScopeListItem.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Ciba/_ScopeListItem.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Ciba/_ScopeListItem.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/ConsentOptions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/ConsentOptions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/ConsentOptions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/ConsentOptions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/InputModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/InputModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/InputModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/InputModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/_ScopeListItem.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Consent/_ScopeListItem.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Consent/_ScopeListItem.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Consent/_ScopeListItem.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/DeviceOptions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/DeviceOptions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/DeviceOptions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/DeviceOptions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/InputModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/InputModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/InputModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/InputModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Success.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/Success.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Success.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/Success.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Success.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/Success.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/Success.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/Success.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/_ScopeListItem.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Device/_ScopeListItem.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Device/_ScopeListItem.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Device/_ScopeListItem.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Diagnostics/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Diagnostics/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Extensions.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Extensions.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Extensions.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Extensions.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Callback.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Callback.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Callback.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Callback.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Callback.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Callback.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Callback.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Callback.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Challenge.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Challenge.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Challenge.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Challenge.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Challenge.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Challenge.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/ExternalLogin/Challenge.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/ExternalLogin/Challenge.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Grants/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Grants/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Grants/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Grants/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Grants/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Grants/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Grants/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/ViewModel.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/ViewModel.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Home/Error/ViewModel.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Home/Error/ViewModel.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Redirect/Index.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Redirect/Index.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Redirect/Index.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Redirect/Index.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Redirect/Index.cshtml.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/Redirect/Index.cshtml.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Redirect/Index.cshtml.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Redirect/Index.cshtml.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/SecurityHeadersAttribute.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/SecurityHeadersAttribute.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/SecurityHeadersAttribute.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/SecurityHeadersAttribute.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_Layout.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_Layout.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_Layout.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_Nav.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_Nav.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_Nav.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_Nav.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_ValidationSummary.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_ValidationSummary.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/Shared/_ValidationSummary.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/Shared/_ValidationSummary.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/TestUsers.cs b/IdentityServer/v7/IdentityServerHost/src/Pages/TestUsers.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/TestUsers.cs
rename to IdentityServer/v7/IdentityServerHost/src/Pages/TestUsers.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/_ViewImports.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/_ViewImports.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/_ViewImports.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/_ViewImports.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Pages/_ViewStart.cshtml b/IdentityServer/v7/IdentityServerHost/src/Pages/_ViewStart.cshtml
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Pages/_ViewStart.cshtml
rename to IdentityServer/v7/IdentityServerHost/src/Pages/_ViewStart.cshtml
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Program.cs b/IdentityServer/v7/IdentityServerHost/src/Program.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Program.cs
rename to IdentityServer/v7/IdentityServerHost/src/Program.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Properties/launchSettings.json b/IdentityServer/v7/IdentityServerHost/src/Properties/launchSettings.json
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Properties/launchSettings.json
rename to IdentityServer/v7/IdentityServerHost/src/Properties/launchSettings.json
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/Resources.cs b/IdentityServer/v7/IdentityServerHost/src/Resources.cs
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/Resources.cs
rename to IdentityServer/v7/IdentityServerHost/src/Resources.cs
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.scss b/IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.scss
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/css/site.scss
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/css/site.scss
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/duende-logo.svg b/IdentityServer/v7/IdentityServerHost/src/wwwroot/duende-logo.svg
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/duende-logo.svg
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/duende-logo.svg
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/favicon.ico b/IdentityServer/v7/IdentityServerHost/src/wwwroot/favicon.ico
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/favicon.ico
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/favicon.ico
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/js/signin-redirect.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/js/signin-redirect.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/js/signin-redirect.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/js/signin-redirect.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/js/signout-redirect.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/js/signout-redirect.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/js/signout-redirect.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/js/signout-redirect.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/LICENSE b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/LICENSE
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/LICENSE
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/README.md b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/README.md
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/README.md
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/README.md
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/LICENSE b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/LICENSE
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/LICENSE
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/LICENSE
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/LICENSE.txt b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/LICENSE.txt
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/LICENSE.txt
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/README.md b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/README.md
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/README.md
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/README.md
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.min.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.min.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.min.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.min.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.min.js b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.min.js
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.min.js
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.min.js
diff --git a/IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.min.map b/IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.min.map
similarity index 100%
rename from IdentityServer/v7/Basics/IdentityServer/src/wwwroot/lib/jquery/dist/jquery.slim.min.map
rename to IdentityServer/v7/IdentityServerHost/src/wwwroot/lib/jquery/dist/jquery.slim.min.map
diff --git a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj
index 0b6e31f2..032796d8 100644
--- a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj
+++ b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj
@@ -5,7 +5,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Duende.IdentityModel" Version="7.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
     <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.1.0" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
diff --git a/IdentityServer/v7/global.json b/IdentityServer/v7/global.json
index e6afd73f..6a288505 100755
--- a/IdentityServer/v7/global.json
+++ b/IdentityServer/v7/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "10.0.100-rc.1.25451.107",
+    "version": "10.0.100",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
-}
\ No newline at end of file
+}
diff --git a/samples.slnx b/samples.slnx
index 1f6af0f0..f970b25b 100644
--- a/samples.slnx
+++ b/samples.slnx
@@ -93,13 +93,13 @@
   </Folder>
   <Folder Name="/BFF/v4/" />
   <Folder Name="/BFF/v4/MultiFrontendSSO/">
-    <Project Path="BFF\v4\MultiFrontendSSO\MultiFrontendSSO.Client\MultiFrontendSSO.Client.csproj" Type="C#">
+    <Project Path="BFF\v4\MultiFrontendSSO\MultiFrontendSSO.Client\MultiFrontendSSO.Client.csproj">
       <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
       <Configuration Solution="Debug|x86" Project="Debug|Any CPU" />
       <Configuration Solution="Release|x64" Project="Release|Any CPU" />
       <Configuration Solution="Release|x86" Project="Release|Any CPU" />
     </Project>
-    <Project Path="BFF\v4\MultiFrontendSSO\MultiFrontendSSO.IdentityServer\MultiFrontendSSO.IdentityServer.csproj" Type="C#">
+    <Project Path="BFF\v4\MultiFrontendSSO\MultiFrontendSSO.IdentityServer\MultiFrontendSSO.IdentityServer.csproj">
       <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
       <Configuration Solution="Debug|x86" Project="Debug|Any CPU" />
       <Configuration Solution="Release|x64" Project="Release|Any CPU" />
@@ -108,6 +108,10 @@
   </Folder>
   <Folder Name="/IdentityServer/" />
   <Folder Name="/IdentityServer/v7/" />
+  <Folder Name="/IdentityServer/v7/Apis/">
+    <Project Path="IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj" />
+    <Project Path="IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj" />
+  </Folder>
   <Folder Name="/IdentityServer/v7/AspNetIdentity/">
     <Project Path="IdentityServer/v7/AspNetIdentity/Client/Client.csproj" />
     <Project Path="IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj" />
@@ -116,16 +120,9 @@
     <Project Path="IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v7/Basics/" />
-  <Folder Name="/IdentityServer/v7/Basics/Apis/">
-    <Project Path="IdentityServer/v7/Basics/Apis/ResourceBasedApi/ResourceBasedApi.csproj" />
-    <Project Path="IdentityServer/v7/Basics/Apis/SimpleApi/SimpleApi.csproj" />
-  </Folder>
   <Folder Name="/IdentityServer/v7/Basics/ClientCredentials/">
     <Project Path="IdentityServer/v7/Basics/ClientCredentials/src/Client.csproj" />
   </Folder>
-  <Folder Name="/IdentityServer/v7/Basics/IdentityServer/">
-    <Project Path="IdentityServer/v7/Basics/IdentityServer/src/IdentityServerHost.csproj" />
-  </Folder>
   <Folder Name="/IdentityServer/v7/Basics/Introspection/">
     <Project Path="IdentityServer/v7/Basics/Introspection/src/Client.csproj" />
   </Folder>
@@ -189,6 +186,9 @@
     <Project Path="IdentityServer/v7/DPoP/IdentityServerHost/IdentityServerHost.csproj" />
     <Project Path="IdentityServer/v7/DPoP/WebClient/WebClient.csproj" />
   </Folder>
+  <Folder Name="/IdentityServer/v7/IdentityServerHost/">
+    <Project Path="IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj" />
+  </Folder>
   <Folder Name="/IdentityServer/v7/McpDemo/">
     <Project Path="IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj" />
     <Project Path="IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj" />
@@ -329,10 +329,10 @@
     <Project Path="various/JwtSecuredAzureFunction/Client/Client.csproj" />
     <Project Path="various/JwtSecuredAzureFunction/JwtSecuredFunction/JwtSecuredFunction.csproj" />
   </Folder>
-  <Project Path="IdentityServer\v7\SessionMigration\SessionMigration.csproj" Type="C#">
+  <Project Path="IdentityServer\v7\SessionMigration\SessionMigration.csproj">
     <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
     <Configuration Solution="Debug|x86" Project="Debug|Any CPU" />
     <Configuration Solution="Release|x64" Project="Release|Any CPU" />
     <Configuration Solution="Release|x86" Project="Release|Any CPU" />
   </Project>
-</Solution>
\ No newline at end of file
+</Solution>