Azure-Samples · jmprieur · Mar 15, 2019 · Mar 13, 2019 · Mar 13, 2019 · Mar 13, 2019
diff --git a/.gitignore b/.gitignore
@@ -8,19 +8,42 @@
 /Microsoft.Identity.Web/.vs
 /Microsoft.Identity.Web/bin
 /Microsoft.Identity.Web/obj
-/1. WebApp signs-in users with Azure AD (OIDC)/1.3. WebApp signs-in work and school or personal accounts/.vs
-/1. WebApp signs-in users with Azure AD (OIDC)/1.3. WebApp signs-in work and school or personal accounts/bin
-/1. WebApp signs-in users with Azure AD (OIDC)/1.3. WebApp signs-in work and school or personal accounts/obj
-/1. WebApp signs-in users with Microsoft Identity (OIDC)/1.1. in my org/.vs
-/1. WebApp signs-in users with Microsoft Identity (OIDC)/1.1. in my org/obj
-/1. WebApp signs-in users with Microsoft Identity (OIDC)/1.1. in my org/bin
-/2. WebApp calls Microsoft Graph on behalf of signed-in user/2.1. using authorization code flow/.vs
-/2. WebApp calls Microsoft Graph on behalf of signed-in user/2.1. using authorization code flow/obj
-/2. WebApp calls Microsoft Graph on behalf of signed-in user/2.1. using authorization code flow/bin
-/3. WebApp calls several APIS (incremental consent and CA)/.vs
-/3. WebApp calls several APIS (incremental consent and CA)/bin
-/3. WebApp calls several APIS (incremental consent and CA)/obj
-/1. WebApp signs-in users with Microsoft Identity (OIDC)/1.3. with work and school or personal accounts/.vs
-/1. WebApp signs-in users with Microsoft Identity (OIDC)/1.3. with work and school or personal accounts/obj
-/2. WebApp calls Microsoft Graph on behalf of signed-in user/2.2/.vs
-/2. WebApp calls Microsoft Graph on behalf of signed-in user/2.1. using authorization code flow/AppCreationScripts/Steps.md
+/1-WebApp-OIDC/1-1-MyOrg/.vs
+/1-WebApp-OIDC/1-1-MyOrg/bin
+/1-WebApp-OIDC/1-1-MyOrg/obj
+/1-WebApp-OIDC/1-2-AnyOrg/.vs
+/1-WebApp-OIDC/1-2-AnyOrg/bin
+/1-WebApp-OIDC/1-2-AnyOrg/obj
+/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/.vs
+/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/bin
+/1-WebApp-OIDC/1-3-AnyOrgOrPersonal/obj
+/1-WebApp-OIDC/1-4-Sovereign/.vs
+/1-WebApp-OIDC/1-4-Sovereign/bin
+/1-WebApp-OIDC/1-4-Sovereign/obj
+/1-WebApp-OIDC/1-5-B2C/.vs
+/1-WebApp-OIDC/1-5-B2C/bin
+/1-WebApp-OIDC/1-5-B2C/obj
+/1-WebApp-OIDC/1-6-SignOut/.vs
+/1-WebApp-OIDC/1-6-SignOut/bin
+/1-WebApp-OIDC/1-6-SignOut/obj
+/2-WebApp-graph-user/2-1-Call-MSGraph/.vs
+/2-WebApp-graph-user/2-1-Call-MSGraph/bin
+/2-WebApp-graph-user/2-1-Call-MSGraph/obj
+/2-WebApp-graph-user/2-2-TokenCache/.vs
+/2-WebApp-graph-user/2-2-TokenCache/bin
+/2-WebApp-graph-user/2-2-TokenCache/obj
+/2-WebApp-graph-user/2-3-Best-Practices/.vs
+/2-WebApp-graph-user/2-3-Best-Practices/bin
+/2-WebApp-graph-user/2-3-Best-Practices/obj
+/3-WebApp-multi-APIs/.vs
+/3-WebApp-multi-APIs/bin
+/3-WebApp-multi-APIs/obj
+/4-WebApp-your-API/.vs
+/4-WebApp-your-API/bin
+/4-WebApp-your-API/obj
+/5-WebApp-AuthZ-Roles-Groups/.vs
+/5-WebApp-AuthZ-Roles-Groups/bin
+/5-WebApp-AuthZ-Roles-Groups/obj
+/6-Deploy-to-Azure/.vs
+/6-Deploy-to-Azure/bin
+/6-Deploy-to-Azure/obj
diff --git a/...Identity (OIDC)/1.1. in my org/.gitignore → 1-WebApp-OIDC/1-1-MyOrg/.gitignore b/...Identity (OIDC)/1.1. in my org/.gitignore → 1-WebApp-OIDC/1-1-MyOrg/.gitignore
diff --git a/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md b/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md
diff --git a/... in my org/AppCreationScripts/Cleanup.ps1 → .../1-1-MyOrg/AppCreationScripts/Cleanup.ps1 b/... in my org/AppCreationScripts/Cleanup.ps1 → .../1-1-MyOrg/AppCreationScripts/Cleanup.ps1
diff --git a/...n my org/AppCreationScripts/Configure.ps1 → ...-1-MyOrg/AppCreationScripts/Configure.ps1 b/...n my org/AppCreationScripts/Configure.ps1 → ...-1-MyOrg/AppCreationScripts/Configure.ps1
diff --git a/... in my org/AppCreationScripts/sample.json → .../1-1-MyOrg/AppCreationScripts/sample.json b/... in my org/AppCreationScripts/sample.json → .../1-1-MyOrg/AppCreationScripts/sample.json
diff --git a/.... in my org/Controllers/HomeController.cs → ...C/1-1-MyOrg/Controllers/HomeController.cs b/.... in my org/Controllers/HomeController.cs → ...C/1-1-MyOrg/Controllers/HomeController.cs
diff --git a/...)/1.1. in my org/Models/ErrorViewModel.cs → ...p-OIDC/1-1-MyOrg/Models/ErrorViewModel.cs b/...)/1.1. in my org/Models/ErrorViewModel.cs → ...p-OIDC/1-1-MyOrg/Models/ErrorViewModel.cs
diff --git a/...Identity (OIDC)/1.1. in my org/Program.cs → 1-WebApp-OIDC/1-1-MyOrg/Program.cs b/...Identity (OIDC)/1.1. in my org/Program.cs → 1-WebApp-OIDC/1-1-MyOrg/Program.cs
diff --git a/... in my org/Properties/launchSettings.json → .../1-1-MyOrg/Properties/launchSettings.json b/... in my org/Properties/launchSettings.json → .../1-1-MyOrg/Properties/launchSettings.json
diff --git a/... Identity (OIDC)/1.1. in my org/README.md → 1-WebApp-OIDC/1-1-MyOrg/README.md b/... Identity (OIDC)/1.1. in my org/README.md → 1-WebApp-OIDC/1-1-MyOrg/README.md
@@ -18,7 +18,7 @@ This sample shows how to build a .NET Core 2.2 MVC Web app that uses OpenID Conn
 
 ![Sign in with Azure AD](ReadmeFiles/sign-in.png)
 
-> This is the first chapter from a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with OpenId Connect, you can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user) in a later chapter.
+> This is the first phase of a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user) in a later chapter
 
 ## How to run this sample
 
@@ -84,7 +84,7 @@ You can clone this sample from your shell or command line:
   ```console
 git clone https://github.com/Azure-Samples/microsoft-identity-platform-aspnetcore-webapp-tutorial webapp
 cd webapp
-cd "1. WebApp signs-in users with Microsoft Identity (OIDC)\1.1. in my org"
+cd "1-WebApp-OIDC\1-1-MyOrg"
   ```
 
 > Given that the name of the sample is very long, and so are the name of the referenced NuGet packages, you might want to clone it in a folder close to the root of your hard drive, to avoid file size limitations on Windows.
@@ -164,8 +164,8 @@ These steps are encapsulated in the [Microsoft.Identity.Web](..\..\Microsoft.Ide
 
 ## Next steps
 
-- Learn how to enable [any organization](../1.2.%20in%20any%20org) or [any Microsoft accounts](../1.3.%20with%20work%20and%20school%20or%20personal%20accounts) to sign-in
-- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user)
+- Learn how to enable [any organization](../1-2-AnyOrg) or [any Microsoft accounts](../1-3-AnyOrgOrPersonal) to sign-in
+- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user)
 
 ## Learn more
 

diff --git a/...C)/1.1. in my org/ReadmeFiles/sign-in.png → ...pp-OIDC/1-1-MyOrg/ReadmeFiles/sign-in.png b/...C)/1.1. in my org/ReadmeFiles/sign-in.png → ...pp-OIDC/1-1-MyOrg/ReadmeFiles/sign-in.png
diff --git a/.... in my org/ReadmeFiles/v2-variations.png → ...C/1-1-MyOrg/ReadmeFiles/v2-variations.png b/.... in my org/ReadmeFiles/v2-variations.png → ...C/1-1-MyOrg/ReadmeFiles/v2-variations.png
diff --git a/...Identity (OIDC)/1.1. in my org/Startup.cs → 1-WebApp-OIDC/1-1-MyOrg/Startup.cs b/...Identity (OIDC)/1.1. in my org/Startup.cs → 1-WebApp-OIDC/1-1-MyOrg/Startup.cs
diff --git a/...C)/1.1. in my org/Views/Home/Index.cshtml → ...pp-OIDC/1-1-MyOrg/Views/Home/Index.cshtml b/...C)/1.1. in my org/Views/Home/Index.cshtml → ...pp-OIDC/1-1-MyOrg/Views/Home/Index.cshtml
diff --git a/.../1.1. in my org/Views/Home/Privacy.cshtml → ...-OIDC/1-1-MyOrg/Views/Home/Privacy.cshtml b/.../1.1. in my org/Views/Home/Privacy.cshtml → ...-OIDC/1-1-MyOrg/Views/Home/Privacy.cshtml
diff --git a/.../1.1. in my org/Views/Shared/Error.cshtml → ...-OIDC/1-1-MyOrg/Views/Shared/Error.cshtml b/.../1.1. in my org/Views/Shared/Error.cshtml → ...-OIDC/1-1-MyOrg/Views/Shared/Error.cshtml
diff --git a/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml b/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml
diff --git a/....1. in my org/Views/Shared/_Layout.cshtml → ...IDC/1-1-MyOrg/Views/Shared/_Layout.cshtml b/....1. in my org/Views/Shared/_Layout.cshtml → ...IDC/1-1-MyOrg/Views/Shared/_Layout.cshtml
diff --git a/... my org/Views/Shared/_LoginPartial.cshtml → ...1-MyOrg/Views/Shared/_LoginPartial.cshtml b/... my org/Views/Shared/_LoginPartial.cshtml → ...1-MyOrg/Views/Shared/_LoginPartial.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/.../1.1. in my org/Views/_ViewImports.cshtml → ...-OIDC/1-1-MyOrg/Views/_ViewImports.cshtml b/.../1.1. in my org/Views/_ViewImports.cshtml → ...-OIDC/1-1-MyOrg/Views/_ViewImports.cshtml
diff --git a/...C)/1.1. in my org/Views/_ViewStart.cshtml → ...pp-OIDC/1-1-MyOrg/Views/_ViewStart.cshtml b/...C)/1.1. in my org/Views/_ViewStart.cshtml → ...pp-OIDC/1-1-MyOrg/Views/_ViewStart.cshtml
diff --git a/...my org/WebApp-OpenIDConnect-DotNet.csproj → ...-MyOrg/WebApp-OpenIDConnect-DotNet.csproj b/...my org/WebApp-OpenIDConnect-DotNet.csproj → ...-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
diff --git a/...in my org/WebApp-OpenIDConnect-DotNet.sln → ...1-1-MyOrg/WebApp-OpenIDConnect-DotNet.sln b/...in my org/WebApp-OpenIDConnect-DotNet.sln → ...1-1-MyOrg/WebApp-OpenIDConnect-DotNet.sln
diff --git a/...1. in my org/appsettings.Development.json → ...DC/1-1-MyOrg/appsettings.Development.json b/...1. in my org/appsettings.Development.json → ...DC/1-1-MyOrg/appsettings.Development.json
diff --git a/...ty (OIDC)/1.1. in my org/appsettings.json → 1-WebApp-OIDC/1-1-MyOrg/appsettings.json b/...ty (OIDC)/1.1. in my org/appsettings.json → 1-WebApp-OIDC/1-1-MyOrg/appsettings.json
diff --git a/...OIDC)/1.1. in my org/wwwroot/css/site.css → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/css/site.css b/...OIDC)/1.1. in my org/wwwroot/css/site.css → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/css/site.css
diff --git a/...)/1.1. in my org/wwwroot/css/site.min.css → ...p-OIDC/1-1-MyOrg/wwwroot/css/site.min.css b/...)/1.1. in my org/wwwroot/css/site.min.css → ...p-OIDC/1-1-MyOrg/wwwroot/css/site.min.css
diff --git a/...(OIDC)/1.1. in my org/wwwroot/favicon.ico → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/favicon.ico b/...(OIDC)/1.1. in my org/wwwroot/favicon.ico → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/favicon.ico
diff --git a/...1.1. in my org/wwwroot/images/banner1.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner1.svg b/...1.1. in my org/wwwroot/images/banner1.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner1.svg
diff --git a/...1.1. in my org/wwwroot/images/banner2.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner2.svg b/...1.1. in my org/wwwroot/images/banner2.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner2.svg
diff --git a/...1.1. in my org/wwwroot/images/banner3.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner3.svg b/...1.1. in my org/wwwroot/images/banner3.svg → ...OIDC/1-1-MyOrg/wwwroot/images/banner3.svg
diff --git a/... (OIDC)/1.1. in my org/wwwroot/js/site.js → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/js/site.js b/... (OIDC)/1.1. in my org/wwwroot/js/site.js → 1-WebApp-OIDC/1-1-MyOrg/wwwroot/js/site.js
diff --git a/...DC)/1.1. in my org/wwwroot/js/site.min.js → ...App-OIDC/1-1-MyOrg/wwwroot/js/site.min.js b/...DC)/1.1. in my org/wwwroot/js/site.min.js → ...App-OIDC/1-1-MyOrg/wwwroot/js/site.min.js
diff --git a/... my org/wwwroot/lib/bootstrap/.bower.json → ...1-MyOrg/wwwroot/lib/bootstrap/.bower.json b/... my org/wwwroot/lib/bootstrap/.bower.json → ...1-MyOrg/wwwroot/lib/bootstrap/.bower.json
diff --git a/.... in my org/wwwroot/lib/bootstrap/LICENSE → ...C/1-1-MyOrg/wwwroot/lib/bootstrap/LICENSE b/.... in my org/wwwroot/lib/bootstrap/LICENSE → ...C/1-1-MyOrg/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css b/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/... org/wwwroot/lib/bootstrap/dist/js/npm.js → ...yOrg/wwwroot/lib/bootstrap/dist/js/npm.js b/... org/wwwroot/lib/bootstrap/dist/js/npm.js → ...yOrg/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/... in my org/wwwroot/lib/jquery/.bower.json → .../1-1-MyOrg/wwwroot/lib/jquery/.bower.json b/... in my org/wwwroot/lib/jquery/.bower.json → .../1-1-MyOrg/wwwroot/lib/jquery/.bower.json
diff --git a/... in my org/wwwroot/lib/jquery/LICENSE.txt → .../1-1-MyOrg/wwwroot/lib/jquery/LICENSE.txt b/... in my org/wwwroot/lib/jquery/LICENSE.txt → .../1-1-MyOrg/wwwroot/lib/jquery/LICENSE.txt
diff --git a/... my org/wwwroot/lib/jquery/dist/jquery.js → ...1-MyOrg/wwwroot/lib/jquery/dist/jquery.js b/... my org/wwwroot/lib/jquery/dist/jquery.js → ...1-MyOrg/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...org/wwwroot/lib/jquery/dist/jquery.min.js → ...Org/wwwroot/lib/jquery/dist/jquery.min.js b/...org/wwwroot/lib/jquery/dist/jquery.min.js → ...Org/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...rg/wwwroot/lib/jquery/dist/jquery.min.map → ...rg/wwwroot/lib/jquery/dist/jquery.min.map b/...rg/wwwroot/lib/jquery/dist/jquery.min.map → ...rg/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/...dentity (OIDC)/1.2. in any org/.gitignore → 1-WebApp-OIDC/1-2-AnyOrg/.gitignore b/...dentity (OIDC)/1.2. in any org/.gitignore → 1-WebApp-OIDC/1-2-AnyOrg/.gitignore
diff --git a/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md b/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md
diff --git a/...in any org/AppCreationScripts/Cleanup.ps1 → ...1-2-AnyOrg/AppCreationScripts/Cleanup.ps1 b/...in any org/AppCreationScripts/Cleanup.ps1 → ...1-2-AnyOrg/AppCreationScripts/Cleanup.ps1
diff --git a/... any org/AppCreationScripts/Configure.ps1 → ...2-AnyOrg/AppCreationScripts/Configure.ps1 b/... any org/AppCreationScripts/Configure.ps1 → ...2-AnyOrg/AppCreationScripts/Configure.ps1
diff --git a/...in any org/AppCreationScripts/sample.json → ...1-2-AnyOrg/AppCreationScripts/sample.json b/...in any org/AppCreationScripts/sample.json → ...1-2-AnyOrg/AppCreationScripts/sample.json
diff --git a/... in any org/Controllers/HomeController.cs → .../1-2-AnyOrg/Controllers/HomeController.cs b/... in any org/Controllers/HomeController.cs → .../1-2-AnyOrg/Controllers/HomeController.cs
diff --git a/.../1.2. in any org/Models/ErrorViewModel.cs → ...-OIDC/1-2-AnyOrg/Models/ErrorViewModel.cs b/.../1.2. in any org/Models/ErrorViewModel.cs → ...-OIDC/1-2-AnyOrg/Models/ErrorViewModel.cs
diff --git a/...dentity (OIDC)/1.2. in any org/Program.cs → 1-WebApp-OIDC/1-2-AnyOrg/Program.cs b/...dentity (OIDC)/1.2. in any org/Program.cs → 1-WebApp-OIDC/1-2-AnyOrg/Program.cs
diff --git a/...in any org/Properties/launchSettings.json → ...1-2-AnyOrg/Properties/launchSettings.json b/...in any org/Properties/launchSettings.json → ...1-2-AnyOrg/Properties/launchSettings.json
diff --git a/...Identity (OIDC)/1.2. in any org/README.md → 1-WebApp-OIDC/1-2-AnyOrg/README.md b/...Identity (OIDC)/1.2. in any org/README.md → 1-WebApp-OIDC/1-2-AnyOrg/README.md
@@ -18,7 +18,7 @@ This sample shows how to build a .NET Core 2.2 MVC Web app that uses OpenID Conn
 
 ![Sign in with Azure AD](ReadmeFiles/sign-in.png)
 
-> This is the first phase of a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user)
+> This is the first phase of a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user)
 
 ## How to run this sample
 
@@ -83,7 +83,7 @@ You can clone this sample from your shell or command line:
   ```console
 git clone https://github.com/Azure-Samples/microsoft-identity-platform-aspnetcore-webapp-tutorial webapp
 cd webapp
-cd "1. WebApp signs-in users with Microsoft Identity (OIDC)\1.2. in any org"
+cd "1-WebApp-OIDC\1-2-AnyOrg"
   ```
 
 > Given that the name of the sample is pretty long, and so are the name of the referenced NuGet packages, you might want to clone it in a folder close to the root of your hard drive, to avoid file size limitations on Windows.
@@ -163,8 +163,8 @@ These steps are encapsulated in the [Microsoft.Identity.Web](..\..\Microsoft.Ide
 
 ## Next steps
 
-- Learn how to enable [your organization](../1.1.%20in%20my%20org) or [any Microsoft accounts](../1.3.%20with%20work%20and%20school%20or%20personal%20accounts) to sign-in
-- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user)
+- Learn how to enable [your organization](../1-1-MyOrg) or [any Microsoft accounts](../1-3-AnyOrgOrPersonal) to sign-in
+- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user)
 
 ## Learn more
 

diff --git a/...)/1.2. in any org/ReadmeFiles/sign-in.png → ...p-OIDC/1-2-AnyOrg/ReadmeFiles/sign-in.png b/...)/1.2. in any org/ReadmeFiles/sign-in.png → ...p-OIDC/1-2-AnyOrg/ReadmeFiles/sign-in.png
diff --git a/... in any org/ReadmeFiles/v2-variations.png → .../1-2-AnyOrg/ReadmeFiles/v2-variations.png b/... in any org/ReadmeFiles/v2-variations.png → .../1-2-AnyOrg/ReadmeFiles/v2-variations.png
diff --git a/...dentity (OIDC)/1.2. in any org/Startup.cs → 1-WebApp-OIDC/1-2-AnyOrg/Startup.cs b/...dentity (OIDC)/1.2. in any org/Startup.cs → 1-WebApp-OIDC/1-2-AnyOrg/Startup.cs
diff --git a/...)/1.2. in any org/Views/Home/Index.cshtml → ...p-OIDC/1-2-AnyOrg/Views/Home/Index.cshtml b/...)/1.2. in any org/Views/Home/Index.cshtml → ...p-OIDC/1-2-AnyOrg/Views/Home/Index.cshtml
diff --git a/...1.2. in any org/Views/Home/Privacy.cshtml → ...OIDC/1-2-AnyOrg/Views/Home/Privacy.cshtml b/...1.2. in any org/Views/Home/Privacy.cshtml → ...OIDC/1-2-AnyOrg/Views/Home/Privacy.cshtml
diff --git a/...1.2. in any org/Views/Shared/Error.cshtml → ...OIDC/1-2-AnyOrg/Views/Shared/Error.cshtml b/...1.2. in any org/Views/Shared/Error.cshtml → ...OIDC/1-2-AnyOrg/Views/Shared/Error.cshtml
diff --git a/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml b/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml
diff --git a/...2. in any org/Views/Shared/_Layout.cshtml → ...DC/1-2-AnyOrg/Views/Shared/_Layout.cshtml b/...2. in any org/Views/Shared/_Layout.cshtml → ...DC/1-2-AnyOrg/Views/Shared/_Layout.cshtml
diff --git a/...any org/Views/Shared/_LoginPartial.cshtml → ...-AnyOrg/Views/Shared/_LoginPartial.cshtml b/...any org/Views/Shared/_LoginPartial.cshtml → ...-AnyOrg/Views/Shared/_LoginPartial.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/...1.2. in any org/Views/_ViewImports.cshtml → ...OIDC/1-2-AnyOrg/Views/_ViewImports.cshtml b/...1.2. in any org/Views/_ViewImports.cshtml → ...OIDC/1-2-AnyOrg/Views/_ViewImports.cshtml
diff --git a/...)/1.2. in any org/Views/_ViewStart.cshtml → ...p-OIDC/1-2-AnyOrg/Views/_ViewStart.cshtml b/...)/1.2. in any org/Views/_ViewStart.cshtml → ...p-OIDC/1-2-AnyOrg/Views/_ViewStart.cshtml
diff --git a/...ny org/WebApp-OpenIDConnect-DotNet.csproj → ...AnyOrg/WebApp-OpenIDConnect-DotNet.csproj b/...ny org/WebApp-OpenIDConnect-DotNet.csproj → ...AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
diff --git a/...n any org/WebApp-OpenIDConnect-DotNet.sln → ...-2-AnyOrg/WebApp-OpenIDConnect-DotNet.sln b/...n any org/WebApp-OpenIDConnect-DotNet.sln → ...-2-AnyOrg/WebApp-OpenIDConnect-DotNet.sln
diff --git a/.... in any org/appsettings.Development.json → ...C/1-2-AnyOrg/appsettings.Development.json b/.... in any org/appsettings.Development.json → ...C/1-2-AnyOrg/appsettings.Development.json
diff --git a/...y (OIDC)/1.2. in any org/appsettings.json → 1-WebApp-OIDC/1-2-AnyOrg/appsettings.json b/...y (OIDC)/1.2. in any org/appsettings.json → 1-WebApp-OIDC/1-2-AnyOrg/appsettings.json
diff --git a/...IDC)/1.2. in any org/wwwroot/css/site.css → ...bApp-OIDC/1-2-AnyOrg/wwwroot/css/site.css b/...IDC)/1.2. in any org/wwwroot/css/site.css → ...bApp-OIDC/1-2-AnyOrg/wwwroot/css/site.css
diff --git a/.../1.2. in any org/wwwroot/css/site.min.css → ...-OIDC/1-2-AnyOrg/wwwroot/css/site.min.css b/.../1.2. in any org/wwwroot/css/site.min.css → ...-OIDC/1-2-AnyOrg/wwwroot/css/site.min.css
diff --git a/...OIDC)/1.2. in any org/wwwroot/favicon.ico → 1-WebApp-OIDC/1-2-AnyOrg/wwwroot/favicon.ico b/...OIDC)/1.2. in any org/wwwroot/favicon.ico → 1-WebApp-OIDC/1-2-AnyOrg/wwwroot/favicon.ico
diff --git a/....2. in any org/wwwroot/images/banner1.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner1.svg b/....2. in any org/wwwroot/images/banner1.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner1.svg
diff --git a/....2. in any org/wwwroot/images/banner2.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner2.svg b/....2. in any org/wwwroot/images/banner2.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner2.svg
diff --git a/....2. in any org/wwwroot/images/banner3.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner3.svg b/....2. in any org/wwwroot/images/banner3.svg → ...IDC/1-2-AnyOrg/wwwroot/images/banner3.svg
diff --git a/...(OIDC)/1.2. in any org/wwwroot/js/site.js → 1-WebApp-OIDC/1-2-AnyOrg/wwwroot/js/site.js b/...(OIDC)/1.2. in any org/wwwroot/js/site.js → 1-WebApp-OIDC/1-2-AnyOrg/wwwroot/js/site.js
diff --git a/...C)/1.2. in any org/wwwroot/js/site.min.js → ...pp-OIDC/1-2-AnyOrg/wwwroot/js/site.min.js b/...C)/1.2. in any org/wwwroot/js/site.min.js → ...pp-OIDC/1-2-AnyOrg/wwwroot/js/site.min.js
diff --git a/...any org/wwwroot/lib/bootstrap/.bower.json → ...-AnyOrg/wwwroot/lib/bootstrap/.bower.json b/...any org/wwwroot/lib/bootstrap/.bower.json → ...-AnyOrg/wwwroot/lib/bootstrap/.bower.json
diff --git a/... in any org/wwwroot/lib/bootstrap/LICENSE → .../1-2-AnyOrg/wwwroot/lib/bootstrap/LICENSE b/... in any org/wwwroot/lib/bootstrap/LICENSE → .../1-2-AnyOrg/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css b/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/... org/wwwroot/lib/bootstrap/dist/js/npm.js → ...yOrg/wwwroot/lib/bootstrap/dist/js/npm.js b/... org/wwwroot/lib/bootstrap/dist/js/npm.js → ...yOrg/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/...in any org/wwwroot/lib/jquery/.bower.json → ...1-2-AnyOrg/wwwroot/lib/jquery/.bower.json b/...in any org/wwwroot/lib/jquery/.bower.json → ...1-2-AnyOrg/wwwroot/lib/jquery/.bower.json
diff --git a/...in any org/wwwroot/lib/jquery/LICENSE.txt → ...1-2-AnyOrg/wwwroot/lib/jquery/LICENSE.txt b/...in any org/wwwroot/lib/jquery/LICENSE.txt → ...1-2-AnyOrg/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...any org/wwwroot/lib/jquery/dist/jquery.js → ...-AnyOrg/wwwroot/lib/jquery/dist/jquery.js b/...any org/wwwroot/lib/jquery/dist/jquery.js → ...-AnyOrg/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...org/wwwroot/lib/jquery/dist/jquery.min.js → ...Org/wwwroot/lib/jquery/dist/jquery.min.js b/...org/wwwroot/lib/jquery/dist/jquery.min.js → ...Org/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...rg/wwwroot/lib/jquery/dist/jquery.min.map → ...rg/wwwroot/lib/jquery/dist/jquery.min.map b/...rg/wwwroot/lib/jquery/dist/jquery.min.map → ...rg/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/...nd school or personal accounts/.gitignore → ...bApp-OIDC/1-3-AnyOrgOrPersonal/.gitignore b/...nd school or personal accounts/.gitignore → ...bApp-OIDC/1-3-AnyOrgOrPersonal/.gitignore
diff --git a/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md b/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md
diff --git a/...l accounts/AppCreationScripts/Cleanup.ps1 → ...OrPersonal/AppCreationScripts/Cleanup.ps1 b/...l accounts/AppCreationScripts/Cleanup.ps1 → ...OrPersonal/AppCreationScripts/Cleanup.ps1
diff --git a/...accounts/AppCreationScripts/Configure.ps1 → ...Personal/AppCreationScripts/Configure.ps1 b/...accounts/AppCreationScripts/Configure.ps1 → ...Personal/AppCreationScripts/Configure.ps1
diff --git a/...l accounts/AppCreationScripts/sample.json → ...OrPersonal/AppCreationScripts/sample.json b/...l accounts/AppCreationScripts/sample.json → ...OrPersonal/AppCreationScripts/sample.json
diff --git a/...al accounts/Controllers/HomeController.cs → ...gOrPersonal/Controllers/HomeController.cs b/...al accounts/Controllers/HomeController.cs → ...gOrPersonal/Controllers/HomeController.cs
diff --git a/...ersonal accounts/Models/ErrorViewModel.cs → ...AnyOrgOrPersonal/Models/ErrorViewModel.cs b/...ersonal accounts/Models/ErrorViewModel.cs → ...AnyOrgOrPersonal/Models/ErrorViewModel.cs
diff --git a/...nd school or personal accounts/Program.cs → ...bApp-OIDC/1-3-AnyOrgOrPersonal/Program.cs b/...nd school or personal accounts/Program.cs → ...bApp-OIDC/1-3-AnyOrgOrPersonal/Program.cs
diff --git a/...l accounts/Properties/launchSettings.json → ...OrPersonal/Properties/launchSettings.json b/...l accounts/Properties/launchSettings.json → ...OrPersonal/Properties/launchSettings.json
diff --git a/...and school or personal accounts/README.md → 1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md b/...and school or personal accounts/README.md → 1-WebApp-OIDC/1-3-AnyOrgOrPersonal/README.md
@@ -18,7 +18,7 @@ This sample shows how to build a .NET Core 2.2 MVC Web app that uses OpenID Conn
 
 ![Sign in with Azure AD](ReadmeFiles/sign-in.png)
 
-> This is the first phase of a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user)
+> This is the first phase of a set of tutorials. Once you understand how to sign-in users in an ASP.NET Core Web App with Open Id Connect, can can learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user)
 
 ## How to run this sample
 
@@ -90,7 +90,7 @@ You can clone this sample from your shell or command line:
 ```Sh
 git clone https://github.com/Azure-Samples/microsoft-identity-platform-aspnetcore-webapp-tutorial webapp
 cd webapp
-cd "1. WebApp signs-in users with Microsoft Identity (OIDC)\1.3. with work and school or personal accounts"
+cd "1-WebApp-OIDC\1-3-AnyOrgOrPersonal"
   ```
 
 > Given that the name of the sample is pretty long, and so are the name of the referenced NuGet packages, you might want to clone it in a folder close to the root of your hard drive, to avoid file size limitations on Windows.
@@ -162,7 +162,7 @@ Open **appsettings.json** and replace the line containing the `TenantId` value w
 "TenantId": "organizations",
 ```
 
-You can also learn from the [1. WebApp signs-in users with Microsoft Identity (OIDC) / in any org/](../1.2.%20in%20any%20org) step of the tutorial if you are interested in this use case. You will also learn how to restrict to this multi-tenant application to specific tenants.
+You can also learn from the [1. WebApp signs-in users with Microsoft Identity (OIDC) / in any org/](../1-2-AnyOrg) step of the tutorial if you are interested in this use case. You will also learn how to restrict to this multi-tenant application to specific tenants.
 
 ### Option 2: Restrict access to only Microsoft personal accounts
 
@@ -182,7 +182,7 @@ You can restrict sign-in access for your application to only user accounts that
    "TenantId": "[Enter the domain of your tenant, e.g. contoso.onmicrosoft.com or the Tenant Id]",
    ```
 
-You can also learn from the [1. WebApp signs-in users with Microsoft Identity (OIDC) / in my org/](../1.1.%20in%20my%20org) step of the tutorial if you are interested in this use case
+You can also learn from the [1. WebApp signs-in users with Microsoft Identity (OIDC) / in my org/](../1-1-MyOrg) step of the tutorial if you are interested in this use case
 
 ## Toubleshooting
 
@@ -208,7 +208,7 @@ These steps are encapsulated in the [Microsoft.Identity.Web](..\..\Microsoft.Ide
 
 ## Next steps
 
-- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2.%20WebApp%20calls%20Microsoft%20Graph%20on%20behalf%20of%20signed-in%20user)
+- Learn how to enable your [Web App to call a Web API on behalf of the signed-in user](../../2-WebApp-graph-user)
 
 ## Learn more
 

diff --git a/...personal accounts/ReadmeFiles/sign-in.png → ...-AnyOrgOrPersonal/ReadmeFiles/sign-in.png b/...personal accounts/ReadmeFiles/sign-in.png → ...-AnyOrgOrPersonal/ReadmeFiles/sign-in.png
diff --git a/...al accounts/ReadmeFiles/v2-variations.png → ...gOrPersonal/ReadmeFiles/v2-variations.png b/...al accounts/ReadmeFiles/v2-variations.png → ...gOrPersonal/ReadmeFiles/v2-variations.png
diff --git a/...nd school or personal accounts/Startup.cs → ...bApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs b/...nd school or personal accounts/Startup.cs → ...bApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs
diff --git a/...personal accounts/Views/Home/Index.cshtml → ...-AnyOrgOrPersonal/Views/Home/Index.cshtml b/...personal accounts/Views/Home/Index.cshtml → ...-AnyOrgOrPersonal/Views/Home/Index.cshtml
diff --git a/...rsonal accounts/Views/Home/Privacy.cshtml → ...nyOrgOrPersonal/Views/Home/Privacy.cshtml b/...rsonal accounts/Views/Home/Privacy.cshtml → ...nyOrgOrPersonal/Views/Home/Privacy.cshtml
diff --git a/...rsonal accounts/Views/Shared/Error.cshtml → ...nyOrgOrPersonal/Views/Shared/Error.cshtml b/...rsonal accounts/Views/Shared/Error.cshtml → ...nyOrgOrPersonal/Views/Shared/Error.cshtml
diff --git a/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml b/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml
diff --git a/...onal accounts/Views/Shared/_Layout.cshtml → ...OrgOrPersonal/Views/Shared/_Layout.cshtml b/...onal accounts/Views/Shared/_Layout.cshtml → ...OrgOrPersonal/Views/Shared/_Layout.cshtml
diff --git a/...ccounts/Views/Shared/_LoginPartial.cshtml → ...ersonal/Views/Shared/_LoginPartial.cshtml b/...ccounts/Views/Shared/_LoginPartial.cshtml → ...ersonal/Views/Shared/_LoginPartial.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/...rsonal accounts/Views/_ViewImports.cshtml → ...nyOrgOrPersonal/Views/_ViewImports.cshtml b/...rsonal accounts/Views/_ViewImports.cshtml → ...nyOrgOrPersonal/Views/_ViewImports.cshtml
diff --git a/...personal accounts/Views/_ViewStart.cshtml → ...-AnyOrgOrPersonal/Views/_ViewStart.cshtml b/...personal accounts/Views/_ViewStart.cshtml → ...-AnyOrgOrPersonal/Views/_ViewStart.cshtml
diff --git a/...counts/WebApp-OpenIDConnect-DotNet.csproj → ...rsonal/WebApp-OpenIDConnect-DotNet.csproj b/...counts/WebApp-OpenIDConnect-DotNet.csproj → ...rsonal/WebApp-OpenIDConnect-DotNet.csproj
diff --git a/... accounts/WebApp-OpenIDConnect-DotNet.sln → ...rPersonal/WebApp-OpenIDConnect-DotNet.sln b/... accounts/WebApp-OpenIDConnect-DotNet.sln → ...rPersonal/WebApp-OpenIDConnect-DotNet.sln
diff --git a/...nal accounts/appsettings.Development.json → ...rgOrPersonal/appsettings.Development.json b/...nal accounts/appsettings.Development.json → ...rgOrPersonal/appsettings.Development.json
diff --git a/...ool or personal accounts/appsettings.json → ...IDC/1-3-AnyOrgOrPersonal/appsettings.json b/...ool or personal accounts/appsettings.json → ...IDC/1-3-AnyOrgOrPersonal/appsettings.json
diff --git a/...or personal accounts/wwwroot/css/site.css → ...1-3-AnyOrgOrPersonal/wwwroot/css/site.css b/...or personal accounts/wwwroot/css/site.css → ...1-3-AnyOrgOrPersonal/wwwroot/css/site.css
diff --git a/...ersonal accounts/wwwroot/css/site.min.css → ...AnyOrgOrPersonal/wwwroot/css/site.min.css b/...ersonal accounts/wwwroot/css/site.min.css → ...AnyOrgOrPersonal/wwwroot/css/site.min.css
diff --git a/... or personal accounts/wwwroot/favicon.ico → .../1-3-AnyOrgOrPersonal/wwwroot/favicon.ico b/... or personal accounts/wwwroot/favicon.ico → .../1-3-AnyOrgOrPersonal/wwwroot/favicon.ico
diff --git a/...sonal accounts/wwwroot/images/banner1.svg → ...yOrgOrPersonal/wwwroot/images/banner1.svg b/...sonal accounts/wwwroot/images/banner1.svg → ...yOrgOrPersonal/wwwroot/images/banner1.svg
diff --git a/...sonal accounts/wwwroot/images/banner2.svg → ...yOrgOrPersonal/wwwroot/images/banner2.svg b/...sonal accounts/wwwroot/images/banner2.svg → ...yOrgOrPersonal/wwwroot/images/banner2.svg
diff --git a/...sonal accounts/wwwroot/images/banner3.svg → ...yOrgOrPersonal/wwwroot/images/banner3.svg b/...sonal accounts/wwwroot/images/banner3.svg → ...yOrgOrPersonal/wwwroot/images/banner3.svg
diff --git a/...l or personal accounts/wwwroot/js/site.js → ...C/1-3-AnyOrgOrPersonal/wwwroot/js/site.js b/...l or personal accounts/wwwroot/js/site.js → ...C/1-3-AnyOrgOrPersonal/wwwroot/js/site.js
diff --git a/... personal accounts/wwwroot/js/site.min.js → ...3-AnyOrgOrPersonal/wwwroot/js/site.min.js b/... personal accounts/wwwroot/js/site.min.js → ...3-AnyOrgOrPersonal/wwwroot/js/site.min.js
diff --git a/...ccounts/wwwroot/lib/bootstrap/.bower.json → ...ersonal/wwwroot/lib/bootstrap/.bower.json b/...ccounts/wwwroot/lib/bootstrap/.bower.json → ...ersonal/wwwroot/lib/bootstrap/.bower.json
diff --git a/...al accounts/wwwroot/lib/bootstrap/LICENSE → ...gOrPersonal/wwwroot/lib/bootstrap/LICENSE b/...al accounts/wwwroot/lib/bootstrap/LICENSE → ...gOrPersonal/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css b/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/...unts/wwwroot/lib/bootstrap/dist/js/npm.js → ...onal/wwwroot/lib/bootstrap/dist/js/npm.js b/...unts/wwwroot/lib/bootstrap/dist/js/npm.js → ...onal/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/...l accounts/wwwroot/lib/jquery/.bower.json → ...OrPersonal/wwwroot/lib/jquery/.bower.json b/...l accounts/wwwroot/lib/jquery/.bower.json → ...OrPersonal/wwwroot/lib/jquery/.bower.json
diff --git a/...l accounts/wwwroot/lib/jquery/LICENSE.txt → ...OrPersonal/wwwroot/lib/jquery/LICENSE.txt b/...l accounts/wwwroot/lib/jquery/LICENSE.txt → ...OrPersonal/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...ccounts/wwwroot/lib/jquery/dist/jquery.js → ...ersonal/wwwroot/lib/jquery/dist/jquery.js b/...ccounts/wwwroot/lib/jquery/dist/jquery.js → ...ersonal/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...nts/wwwroot/lib/jquery/dist/jquery.min.js → ...nal/wwwroot/lib/jquery/dist/jquery.min.js b/...nts/wwwroot/lib/jquery/dist/jquery.min.js → ...nal/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...ts/wwwroot/lib/jquery/dist/jquery.min.map → ...al/wwwroot/lib/jquery/dist/jquery.min.map b/...ts/wwwroot/lib/jquery/dist/jquery.min.map → ...al/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/... national and sovereign clouds/.gitignore → 1-WebApp-OIDC/1-4-Sovereign/.gitignore b/... national and sovereign clouds/.gitignore → 1-WebApp-OIDC/1-4-Sovereign/.gitignore
diff --git a/...onal and sovereign clouds/Placeholder.txt → 1-WebApp-OIDC/1-4-Sovereign/Placeholder.txt b/...onal and sovereign clouds/Placeholder.txt → 1-WebApp-OIDC/1-4-Sovereign/Placeholder.txt
diff --git a/.... with social identities (B2C)/.gitignore → 1-WebApp-OIDC/1-5-B2C/.gitignore b/.... with social identities (B2C)/.gitignore → 1-WebApp-OIDC/1-5-B2C/.gitignore
diff --git a/...h social identities (B2C)/Placeholder.txt → 1-WebApp-OIDC/1-5-B2C/Placeholder.txt b/...h social identities (B2C)/Placeholder.txt → 1-WebApp-OIDC/1-5-B2C/Placeholder.txt
diff --git a/...C)/1.6. and lets them sign-out/.gitignore → 1-WebApp-OIDC/1-6-SignOut/.gitignore b/...C)/1.6. and lets them sign-out/.gitignore → 1-WebApp-OIDC/1-6-SignOut/.gitignore
diff --git a/...6. and lets them sign-out/Placeholder.txt → 1-WebApp-OIDC/1-6-SignOut/Placeholder.txt b/...6. and lets them sign-out/Placeholder.txt → 1-WebApp-OIDC/1-6-SignOut/Placeholder.txt
diff --git a/... with Microsoft Identity (OIDC)/README.md → 1-WebApp-OIDC/README.md b/... with Microsoft Identity (OIDC)/README.md → 1-WebApp-OIDC/README.md
@@ -17,12 +17,12 @@ In this phase of the tutorial, you will learn, how to add sign-in users to your
 
    Depending on your business needs, you have the flexibility to decide which audience to sign-in to your application:
 
-   1. If you are a Line of Business (LOB) developer, you'll want to [sign-in users in your organization](./1.1.%20in%20my%20org) with their work or school accounts.
-   1. If you are an ISV, you'll want to [sign-in users in any organization](./1.2.%20in%20any%20org), still  with their work or school accounts.
-   1. If you are an ISV targetting both organizations and individuals, you'll want to [sign-in users with their work and school accounts or Microsoft personal accounts](./1.3.%20with%20work%20and%20school%20or%20personal%20accounts).
-   1. If you target organizations (work or school accounts), you can also enable your application to sign-in users in [national and sovereign clouds](./1.4.%20in%20national%20and%20sovereign%20clouds).
-   1. If you are a business wanting to connect with your customers, or with small business partners, you might also want to [sign-in users with their social identities](./1.5.%20with%20social%20identities%20(B2C)) using Microsoft Azure AD B2C
-   1. Finally, you'll want to let users [sign-out](./1.6.%20and%20lets%20them%20sign-out) of our application, or of the browser
+   1. If you are a Line of Business (LOB) developer, you'll want to [sign-in users in your organization](./1-1-MyOrg) with their work or school accounts.
+   1. If you are an ISV, you'll want to [sign-in users in any organization](./1-2-AnyOrg), still  with their work or school accounts.
+   1. If you are an ISV targetting both organizations and individuals, you'll want to [sign-in users with their work and school accounts or Microsoft personal accounts](./1-3-AnyOrgOrPersonal).
+   1. If you target organizations (work or school accounts), you can also enable your application to sign-in users in [national and sovereign clouds](./1-4-Sovereign).
+   1. If you are a business wanting to connect with your customers, or with small business partners, you might also want to [sign-in users with their social identities](./1-5-B2C) using Microsoft Azure AD B2C
+   1. Finally, you'll want to let users [sign-out](./1-6-SignOut) of our application, or of the browser
 
 ## Next phases
 

diff --git a/... using authorization code flow/.gitignore → ...pp-graph-user/2-1-Call-MSGraph/.gitignore b/... using authorization code flow/.gitignore → ...pp-graph-user/2-1-Call-MSGraph/.gitignore
diff --git a/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md b/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md
diff --git a/... code flow/AppCreationScripts/Cleanup.ps1 → ...ll-MSGraph/AppCreationScripts/Cleanup.ps1 b/... code flow/AppCreationScripts/Cleanup.ps1 → ...ll-MSGraph/AppCreationScripts/Cleanup.ps1
diff --git a/...ode flow/AppCreationScripts/Configure.ps1 → ...-MSGraph/AppCreationScripts/Configure.ps1 b/...ode flow/AppCreationScripts/Configure.ps1 → ...-MSGraph/AppCreationScripts/Configure.ps1
diff --git a/... code flow/AppCreationScripts/sample.json → ...ll-MSGraph/AppCreationScripts/sample.json b/... code flow/AppCreationScripts/sample.json → ...ll-MSGraph/AppCreationScripts/sample.json
diff --git a/...n code flow/Controllers/HomeController.cs → ...all-MSGraph/Controllers/HomeController.cs b/...n code flow/Controllers/HomeController.cs → ...all-MSGraph/Controllers/HomeController.cs
diff --git a/...ion code flow/Infrastructure/Constants.cs → ...-Call-MSGraph/Infrastructure/Constants.cs b/...ion code flow/Infrastructure/Constants.cs → ...-Call-MSGraph/Infrastructure/Constants.cs
diff --git a/...zation code flow/Models/ErrorViewModel.cs → ...2-1-Call-MSGraph/Models/ErrorViewModel.cs b/...zation code flow/Models/ErrorViewModel.cs → ...2-1-Call-MSGraph/Models/ErrorViewModel.cs
diff --git a/... using authorization code flow/Program.cs → ...pp-graph-user/2-1-Call-MSGraph/Program.cs b/... using authorization code flow/Program.cs → ...pp-graph-user/2-1-Call-MSGraph/Program.cs
diff --git a/... code flow/Properties/launchSettings.json → ...ll-MSGraph/Properties/launchSettings.json b/... code flow/Properties/launchSettings.json → ...ll-MSGraph/Properties/launchSettings.json
diff --git a/.... using authorization code flow/README.md → ...App-graph-user/2-1-Call-MSGraph/README.md b/.... using authorization code flow/README.md → ...App-graph-user/2-1-Call-MSGraph/README.md
@@ -24,7 +24,7 @@ To run this sample:
 
 > Pre-requisites:
 >
-> go through the previous phase of the tutorial showing how the [WebApp signs-in users with Microsoft Identity (OIDC) / with work and school or personal accounts](../../1.%20WebApp%20signs-in%20users%20with%20Microsoft%20Identity%20(OIDC)/1.3.%20with%20work%20and%20school%20or%20personal%20accounts). This page shows the incremental change required to call the Microsoft Graph API on behalf of a user that has successfully signed in to the web app.
+> go through the previous phase of the tutorial showing how the [WebApp signs-in users with Microsoft Identity (OIDC) / with work and school or personal accounts](../../1-WebApp-OIDC/1-3-AnyOrgOrPersonal). This page shows the incremental change required to call the Microsoft Graph API on behalf of a user that has successfully signed in to the web app.
 
 ### Step 1: Register the sample with your Azure AD tenant
 
@@ -47,12 +47,13 @@ If you have not already,  clone this sample from your shell or command line:
   ```Sh
   git clone https://github.com/Azure-Samples/microsoft-identity-platform-aspnetcore-webapp-tutorial webapp
   cd webapp
+
   ```
 
-Go to the `"2. WebApp calls Microsoft Graph on behalf of signed-in use/2.1. using authorization code flow"` folder
+Go to the `"2-WebApp-graph-user\2-1-Call-MSGraph"` folder
 
  ```Sh
-  cd "2. WebApp calls Microsoft Graph on behalf of signed-in use\2.1. using authorization code flow"
+  cd "2-WebApp-graph-user\2-1-Call-MSGraph"
   ```
 
   In the appsettings.json file, replace, if you have not already:
@@ -77,7 +78,7 @@ Go to the `"2. WebApp calls Microsoft Graph on behalf of signed-in use/2.1. usin
 
 ## About The code
 
-Starting from the [previous phase of the tutorial](../../1.%20WebApp%20signs-in%20users%20with%20Microsoft%20Identity%20(OIDC)), the code was incrementally updated with the following steps:
+Starting from the [previous phase of the tutorial](../../1-WebApp-OIDC), the code was incrementally updated with the following steps:
 
 ### Update the `Startup.cs` file to enable TokenAcquisition by a MSAL.NET based service
 
@@ -208,10 +209,10 @@ HTML table displaying the properties of the *me* object as returned by Microsoft
 
 ## Next steps
 
-- Learn how to enable distributed caches in [token cache serialization](../2.2.%20token%20cache%20serialization)
+- Learn how to enable distributed caches in [token cache serialization](../2-2-TokenCache)
 - Learn how the same principle you've just learnt can be used to call:
-  - [several Microsoft APIs](../../3.%20WebApp%20calls%20several%20APIS%20(incremental%20consent%20and%20CA)), which will enable you to learn how incremental consent and conditional access is managed in your Web App
-  - 3rd party, or even [your own Web API](../../4.%20WebApp%20calls%20your%20own%20Web%20API), which will enable you to learn about custom scopes
+  - [several Microsoft APIs](../../3-WebApp-multi-APIs), which will enable you to learn how incremental consent and conditional access is managed in your Web App
+  - 3rd party, or even [your own Web API](../../4-WebApp-your-API), which will enable you to learn about custom scopes
 
 ## Learn more
 

diff --git a/...ization code flow/ReadmeFiles/sign-in.png → .../2-1-Call-MSGraph/ReadmeFiles/sign-in.png b/...ization code flow/ReadmeFiles/sign-in.png → .../2-1-Call-MSGraph/ReadmeFiles/sign-in.png
diff --git a/...n code flow/ReadmeFiles/v2-variations.png → ...all-MSGraph/ReadmeFiles/v2-variations.png b/...n code flow/ReadmeFiles/v2-variations.png → ...all-MSGraph/ReadmeFiles/v2-variations.png
diff --git a/...vices/MicrosoftGraph-Rest/Bootstrapper.cs → ...vices/MicrosoftGraph-Rest/Bootstrapper.cs b/...vices/MicrosoftGraph-Rest/Bootstrapper.cs → ...vices/MicrosoftGraph-Rest/Bootstrapper.cs
diff --git a/...oftGraph-Rest/GraphApiOperationService.cs → ...oftGraph-Rest/GraphApiOperationService.cs b/...oftGraph-Rest/GraphApiOperationService.cs → ...oftGraph-Rest/GraphApiOperationService.cs
diff --git a/...icrosoftGraph-Rest/IGraphApiOperations.cs → ...icrosoftGraph-Rest/IGraphApiOperations.cs b/...icrosoftGraph-Rest/IGraphApiOperations.cs → ...icrosoftGraph-Rest/IGraphApiOperations.cs
diff --git a/...ervices/MicrosoftGraph-Rest/WebOptions.cs → ...ervices/MicrosoftGraph-Rest/WebOptions.cs b/...ervices/MicrosoftGraph-Rest/WebOptions.cs → ...ervices/MicrosoftGraph-Rest/WebOptions.cs
diff --git a/... using authorization code flow/Startup.cs → ...pp-graph-user/2-1-Call-MSGraph/Startup.cs b/... using authorization code flow/Startup.cs → ...pp-graph-user/2-1-Call-MSGraph/Startup.cs
diff --git a/...ization code flow/Views/Home/Index.cshtml → .../2-1-Call-MSGraph/Views/Home/Index.cshtml b/...ization code flow/Views/Home/Index.cshtml → .../2-1-Call-MSGraph/Views/Home/Index.cshtml
diff --git a/...ation code flow/Views/Home/Privacy.cshtml → ...-1-Call-MSGraph/Views/Home/Privacy.cshtml b/...ation code flow/Views/Home/Privacy.cshtml → ...-1-Call-MSGraph/Views/Home/Privacy.cshtml
diff --git a/...ation code flow/Views/Home/Profile.cshtml → ...-1-Call-MSGraph/Views/Home/Profile.cshtml b/...ation code flow/Views/Home/Profile.cshtml → ...-1-Call-MSGraph/Views/Home/Profile.cshtml
diff --git a/...ation code flow/Views/Shared/Error.cshtml → ...-1-Call-MSGraph/Views/Shared/Error.cshtml b/...ation code flow/Views/Shared/Error.cshtml → ...-1-Call-MSGraph/Views/Shared/Error.cshtml
diff --git a/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml b/...Views/Shared/_CookieConsentPartial.cshtml → ...Views/Shared/_CookieConsentPartial.cshtml
diff --git a/...ion code flow/Views/Shared/_Layout.cshtml → ...-Call-MSGraph/Views/Shared/_Layout.cshtml b/...ion code flow/Views/Shared/_Layout.cshtml → ...-Call-MSGraph/Views/Shared/_Layout.cshtml
diff --git a/...de flow/Views/Shared/_LoginPartial.cshtml → ...MSGraph/Views/Shared/_LoginPartial.cshtml b/...de flow/Views/Shared/_LoginPartial.cshtml → ...MSGraph/Views/Shared/_LoginPartial.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/...ation code flow/Views/_ViewImports.cshtml → ...-1-Call-MSGraph/Views/_ViewImports.cshtml b/...ation code flow/Views/_ViewImports.cshtml → ...-1-Call-MSGraph/Views/_ViewImports.cshtml
diff --git a/...ization code flow/Views/_ViewStart.cshtml → .../2-1-Call-MSGraph/Views/_ViewStart.cshtml b/...ization code flow/Views/_ViewStart.cshtml → .../2-1-Call-MSGraph/Views/_ViewStart.cshtml
diff --git a/...e flow/WebApp-OpenIDConnect-DotNet.csproj → ...SGraph/WebApp-OpenIDConnect-DotNet.csproj b/...e flow/WebApp-OpenIDConnect-DotNet.csproj → ...SGraph/WebApp-OpenIDConnect-DotNet.csproj
diff --git a/...code flow/WebApp-OpenIDConnect-DotNet.sln → ...l-MSGraph/WebApp-OpenIDConnect-DotNet.sln b/...code flow/WebApp-OpenIDConnect-DotNet.sln → ...l-MSGraph/WebApp-OpenIDConnect-DotNet.sln
diff --git a/...on code flow/appsettings.Development.json → ...Call-MSGraph/appsettings.Development.json b/...on code flow/appsettings.Development.json → ...Call-MSGraph/appsettings.Development.json
diff --git a/... authorization code flow/appsettings.json → ...ph-user/2-1-Call-MSGraph/appsettings.json b/... authorization code flow/appsettings.json → ...ph-user/2-1-Call-MSGraph/appsettings.json
diff --git a/...horization code flow/wwwroot/css/site.css → ...ser/2-1-Call-MSGraph/wwwroot/css/site.css b/...horization code flow/wwwroot/css/site.css → ...ser/2-1-Call-MSGraph/wwwroot/css/site.css
diff --git a/...zation code flow/wwwroot/css/site.min.css → ...2-1-Call-MSGraph/wwwroot/css/site.min.css b/...zation code flow/wwwroot/css/site.min.css → ...2-1-Call-MSGraph/wwwroot/css/site.min.css
diff --git a/...thorization code flow/wwwroot/favicon.ico → ...user/2-1-Call-MSGraph/wwwroot/favicon.ico b/...thorization code flow/wwwroot/favicon.ico → ...user/2-1-Call-MSGraph/wwwroot/favicon.ico
diff --git a/...tion code flow/wwwroot/images/banner1.svg → ...1-Call-MSGraph/wwwroot/images/banner1.svg b/...tion code flow/wwwroot/images/banner1.svg → ...1-Call-MSGraph/wwwroot/images/banner1.svg
diff --git a/...tion code flow/wwwroot/images/banner2.svg → ...1-Call-MSGraph/wwwroot/images/banner2.svg b/...tion code flow/wwwroot/images/banner2.svg → ...1-Call-MSGraph/wwwroot/images/banner2.svg
diff --git a/...tion code flow/wwwroot/images/banner3.svg → ...1-Call-MSGraph/wwwroot/images/banner3.svg b/...tion code flow/wwwroot/images/banner3.svg → ...1-Call-MSGraph/wwwroot/images/banner3.svg
diff --git a/...uthorization code flow/wwwroot/js/site.js → ...-user/2-1-Call-MSGraph/wwwroot/js/site.js b/...uthorization code flow/wwwroot/js/site.js → ...-user/2-1-Call-MSGraph/wwwroot/js/site.js
diff --git a/...rization code flow/wwwroot/js/site.min.js → ...r/2-1-Call-MSGraph/wwwroot/js/site.min.js b/...rization code flow/wwwroot/js/site.min.js → ...r/2-1-Call-MSGraph/wwwroot/js/site.min.js
diff --git a/...de flow/wwwroot/lib/bootstrap/.bower.json → ...MSGraph/wwwroot/lib/bootstrap/.bower.json b/...de flow/wwwroot/lib/bootstrap/.bower.json → ...MSGraph/wwwroot/lib/bootstrap/.bower.json
diff --git a/...n code flow/wwwroot/lib/bootstrap/LICENSE → ...all-MSGraph/wwwroot/lib/bootstrap/LICENSE b/...n code flow/wwwroot/lib/bootstrap/LICENSE → ...all-MSGraph/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css b/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/...flow/wwwroot/lib/bootstrap/dist/js/npm.js → ...raph/wwwroot/lib/bootstrap/dist/js/npm.js b/...flow/wwwroot/lib/bootstrap/dist/js/npm.js → ...raph/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/... code flow/wwwroot/lib/jquery/.bower.json → ...ll-MSGraph/wwwroot/lib/jquery/.bower.json b/... code flow/wwwroot/lib/jquery/.bower.json → ...ll-MSGraph/wwwroot/lib/jquery/.bower.json
diff --git a/... code flow/wwwroot/lib/jquery/LICENSE.txt → ...ll-MSGraph/wwwroot/lib/jquery/LICENSE.txt b/... code flow/wwwroot/lib/jquery/LICENSE.txt → ...ll-MSGraph/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...de flow/wwwroot/lib/jquery/dist/jquery.js → ...MSGraph/wwwroot/lib/jquery/dist/jquery.js b/...de flow/wwwroot/lib/jquery/dist/jquery.js → ...MSGraph/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...low/wwwroot/lib/jquery/dist/jquery.min.js → ...aph/wwwroot/lib/jquery/dist/jquery.min.js b/...low/wwwroot/lib/jquery/dist/jquery.min.js → ...aph/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...ow/wwwroot/lib/jquery/dist/jquery.min.map → ...ph/wwwroot/lib/jquery/dist/jquery.min.map b/...ow/wwwroot/lib/jquery/dist/jquery.min.map → ...ph/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/...2.2. token cache serialization/.gitignore → ...bApp-graph-user/2-2-TokenCache/.gitignore b/...2.2. token cache serialization/.gitignore → ...bApp-graph-user/2-2-TokenCache/.gitignore
diff --git a/... token cache serialization/placeholder.md → ...-graph-user/2-2-TokenCache/placeholder.md b/... token cache serialization/placeholder.md → ...-graph-user/2-2-TokenCache/placeholder.md
diff --git a/...actices and practices to avoid/.gitignore → ...-graph-user/2-3-Best-Practices/.gitignore b/...actices and practices to avoid/.gitignore → ...-graph-user/2-3-Best-Practices/.gitignore
diff --git a/...es and practices to avoid/Placeholder.txt → ...h-user/2-3-Best-Practices/Placeholder.txt b/...es and practices to avoid/Placeholder.txt → ...h-user/2-3-Best-Practices/Placeholder.txt
diff --git a/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md b/.../AppCreationScripts/AppCreationScripts.md → .../AppCreationScripts/AppCreationScripts.md
diff --git a/...nt and CA)/AppCreationScripts/Cleanup.ps1 → ...multi-APIs/AppCreationScripts/Cleanup.ps1 b/...nt and CA)/AppCreationScripts/Cleanup.ps1 → ...multi-APIs/AppCreationScripts/Cleanup.ps1
diff --git a/... and CA)/AppCreationScripts/Configure.ps1 → ...lti-APIs/AppCreationScripts/Configure.ps1 b/... and CA)/AppCreationScripts/Configure.ps1 → ...lti-APIs/AppCreationScripts/Configure.ps1
diff --git a/...nt and CA)/AppCreationScripts/sample.json → ...multi-APIs/AppCreationScripts/sample.json b/...nt and CA)/AppCreationScripts/sample.json → ...multi-APIs/AppCreationScripts/sample.json
diff --git a/...ent and CA)/Controllers/HomeController.cs → ...-multi-APIs/Controllers/HomeController.cs b/...ent and CA)/Controllers/HomeController.cs → ...-multi-APIs/Controllers/HomeController.cs
diff --git a/...nsent and CA)/Infrastructure/Constants.cs → ...pp-multi-APIs/Infrastructure/Constants.cs b/...nsent and CA)/Infrastructure/Constants.cs → ...pp-multi-APIs/Infrastructure/Constants.cs
diff --git a/... consent and CA)/Models/ErrorViewModel.cs → 3-WebApp-multi-APIs/Models/ErrorViewModel.cs b/... consent and CA)/Models/ErrorViewModel.cs → 3-WebApp-multi-APIs/Models/ErrorViewModel.cs
diff --git a/...S (incremental consent and CA)/Program.cs → 3-WebApp-multi-APIs/Program.cs b/...S (incremental consent and CA)/Program.cs → 3-WebApp-multi-APIs/Program.cs
diff --git a/...nt and CA)/Properties/launchSettings.json → ...multi-APIs/Properties/launchSettings.json b/...nt and CA)/Properties/launchSettings.json → ...multi-APIs/Properties/launchSettings.json
diff --git a/...IS (incremental consent and CA)/README.md → 3-WebApp-multi-APIs/README.md b/...IS (incremental consent and CA)/README.md → 3-WebApp-multi-APIs/README.md
@@ -51,7 +51,7 @@ You can clone this sample from your shell or command line:
 
   ```console
   git clone https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2
-  git checkout aspnetcore2-2-signInAndCallGraph
+  cd "3-WebApp-multi-APIs"
   ```
 
   In the appsettings.json file, replace:

diff --git a/...l consent and CA)/ReadmeFiles/sign-in.png → 3-WebApp-multi-APIs/ReadmeFiles/sign-in.png b/...l consent and CA)/ReadmeFiles/sign-in.png → 3-WebApp-multi-APIs/ReadmeFiles/sign-in.png
diff --git a/...ent and CA)/ReadmeFiles/v2-variations.png → ...-multi-APIs/ReadmeFiles/v2-variations.png b/...ent and CA)/ReadmeFiles/v2-variations.png → ...-multi-APIs/ReadmeFiles/v2-variations.png
diff --git a/... CA)/Services/ARM/ArmOperationsService.cs → ...APIs/Services/ARM/ArmOperationsService.cs b/... CA)/Services/ARM/ArmOperationsService.cs → ...APIs/Services/ARM/ArmOperationsService.cs
diff --git a/...A)/Services/ARM/ArmSimplifiedDataModel.cs → ...Is/Services/ARM/ArmSimplifiedDataModel.cs b/...A)/Services/ARM/ArmSimplifiedDataModel.cs → ...Is/Services/ARM/ArmSimplifiedDataModel.cs