diff --git a/.github/workflows/o2-auth.yml b/.github/workflows/o2-auth.yml
new file mode 100644
index 00000000..3cf6019f
--- /dev/null
+++ b/.github/workflows/o2-auth.yml
@@ -0,0 +1,42 @@
+name: .NET
+
+on:
+  push:
+    branches:
+    - master
+    - dev
+  pull_request:
+    branches:
+    - master
+    - dev
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.2.x
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: src/Services/auth
+    - name: Build
+      run: dotnet build --no-restore
+      working-directory: src/Services/auth
+    
+    - name: Unit Tests
+      run: dotnet test Tests.O2NextGen.Auth.Web.csproj --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutput=TestResults/Tests.O2NextGen.Auth.Web.info /p:CoverletOutputFormat=lcov
+      working-directory: src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/
+    
+    - name: Integration Tests
+      run: dotnet test src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj --no-build --verbosity normal /p:MergeWith=src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/TestResults/Tests.O2NextGen.Auth.Web.info /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
+
+    - name: Publish coverage report to coveralls.io
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/TestResults/coverage.info
\ No newline at end of file
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Areas/Identity/Pages/_ViewStart.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Areas/Identity/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Areas/Identity/Pages/_ViewStart.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Areas/Identity/Pages/_ViewStart.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/ApplicationDbContext.cs b/src/Services/auth/O2NextGen.Auth.Reference/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/ApplicationDbContext.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Data/ApplicationDbContext.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/00000000000000_CreateIdentitySchema.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Data/Migrations/ApplicationDbContextModelSnapshot.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Data/Migrations/ApplicationDbContextModelSnapshot.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/O2NextGen.Auth.Reference.csproj b/src/Services/auth/O2NextGen.Auth.Reference/O2NextGen.Auth.Reference.csproj
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/O2NextGen.Auth.Reference.csproj
rename to src/Services/auth/O2NextGen.Auth.Reference/O2NextGen.Auth.Reference.csproj
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Error.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Error.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Error.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Error.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Error.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Error.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Error.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Error.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Index.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Index.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Index.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Index.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Index.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Index.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Index.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Index.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Privacy.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_CookieConsentPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_CookieConsentPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_CookieConsentPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_CookieConsentPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_Layout.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_Layout.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_Layout.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_LoginPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_LoginPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/Shared/_ValidationScriptsPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/Shared/_ValidationScriptsPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/_ViewStart.cshtml b/src/Services/auth/O2NextGen.Auth.Reference/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Pages/_ViewStart.cshtml
rename to src/Services/auth/O2NextGen.Auth.Reference/Pages/_ViewStart.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Program.cs b/src/Services/auth/O2NextGen.Auth.Reference/Program.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Program.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Program.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Properties/launchSettings.json b/src/Services/auth/O2NextGen.Auth.Reference/Properties/launchSettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Properties/launchSettings.json
rename to src/Services/auth/O2NextGen.Auth.Reference/Properties/launchSettings.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Startup.cs b/src/Services/auth/O2NextGen.Auth.Reference/Startup.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/Startup.cs
rename to src/Services/auth/O2NextGen.Auth.Reference/Startup.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/app.db b/src/Services/auth/O2NextGen.Auth.Reference/app.db
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/app.db
rename to src/Services/auth/O2NextGen.Auth.Reference/app.db
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/appsettings.Development.json b/src/Services/auth/O2NextGen.Auth.Reference/appsettings.Development.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/appsettings.Development.json
rename to src/Services/auth/O2NextGen.Auth.Reference/appsettings.Development.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/appsettings.json b/src/Services/auth/O2NextGen.Auth.Reference/appsettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/appsettings.json
rename to src/Services/auth/O2NextGen.Auth.Reference/appsettings.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/css/site.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/css/site.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/css/site.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/css/site.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/favicon.ico b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/favicon.ico
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/favicon.ico
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/favicon.ico
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/js/site.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/js/site.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/js/site.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/js/site.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/LICENSE b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/LICENSE
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/LICENSE.md b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/LICENSE.md
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/LICENSE.txt b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/LICENSE.txt
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.js b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.js
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.map b/src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.map
rename to src/Services/auth/O2NextGen.Auth.Reference/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/IdentityHostingStartup.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/IdentityHostingStartup.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/IdentityHostingStartup.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/IdentityHostingStartup.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Lockout.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Login.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Logout.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
similarity index 96%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
index e3b60960..f32b6a5b 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
+++ b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
@@ -148,7 +148,7 @@ private string GenerateQrCodeUri(string email, string unformattedKey)
         {
             return string.Format(
                 AuthenticatorUriFormat,
-                _urlEncoder.Encode("O2NextGen.Auth.Sample"),
+                _urlEncoder.Encode("O2NextGen.Auth.Web.Sample"),
                 _urlEncoder.Encode(email),
                 unformattedKey);
         }
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Error.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewStart.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewStart.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/_ViewStart.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/ApplicationDbContext.cs b/src/Services/auth/O2NextGen.Auth.Sample/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/ApplicationDbContext.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Data/ApplicationDbContext.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/00000000000000_CreateIdentitySchema.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Data/Migrations/ApplicationDbContextModelSnapshot.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj b/src/Services/auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj
similarity index 93%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj
rename to src/Services/auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj
index 2c60e09c..c060b625 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj
+++ b/src/Services/auth/O2NextGen.Auth.Sample/O2NextGen.Auth.Reference.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
 
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'O2NextGen.Auth.Sample' " />
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Error.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Error.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Error.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Error.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Error.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Error.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Error.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Error.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Index.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Index.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Index.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Index.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Index.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Index.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Index.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Index.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Privacy.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_CookieConsentPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_CookieConsentPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_CookieConsentPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_CookieConsentPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml
similarity index 92%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml
index 49038813..ca991645 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml
+++ b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - O2NextGen.Auth.Sample</title>
+    <title>@ViewData["Title"] - O2NextGen.Auth.Web.Sample</title>
 
     <environment include="Development">
         <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
@@ -21,7 +21,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">O2NextGen.Auth.Sample</a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index">O2NextGen.Auth.Web.Sample</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -49,7 +49,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2021 - O2NextGen.Auth.Sample - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2021 - O2NextGen.Auth.Web.Sample - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
 
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_LoginPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_LoginPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_LoginPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_LoginPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/Shared/_ValidationScriptsPartial.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/Shared/_ValidationScriptsPartial.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/_ViewStart.cshtml b/src/Services/auth/O2NextGen.Auth.Sample/Pages/_ViewStart.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Pages/_ViewStart.cshtml
rename to src/Services/auth/O2NextGen.Auth.Sample/Pages/_ViewStart.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Program.cs b/src/Services/auth/O2NextGen.Auth.Sample/Program.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Program.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Program.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/launchSettings.json b/src/Services/auth/O2NextGen.Auth.Sample/Properties/launchSettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/launchSettings.json
rename to src/Services/auth/O2NextGen.Auth.Sample/Properties/launchSettings.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.json b/src/Services/auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.json
rename to src/Services/auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.local.json b/src/Services/auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.local.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.local.json
rename to src/Services/auth/O2NextGen.Auth.Sample/Properties/serviceDependencies.local.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/ScaffoldingReadme.txt b/src/Services/auth/O2NextGen.Auth.Sample/ScaffoldingReadme.txt
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/ScaffoldingReadme.txt
rename to src/Services/auth/O2NextGen.Auth.Sample/ScaffoldingReadme.txt
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Startup.cs b/src/Services/auth/O2NextGen.Auth.Sample/Startup.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/Startup.cs
rename to src/Services/auth/O2NextGen.Auth.Sample/Startup.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/appsettings.Development.json b/src/Services/auth/O2NextGen.Auth.Sample/appsettings.Development.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/appsettings.Development.json
rename to src/Services/auth/O2NextGen.Auth.Sample/appsettings.Development.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/appsettings.json b/src/Services/auth/O2NextGen.Auth.Sample/appsettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/appsettings.json
rename to src/Services/auth/O2NextGen.Auth.Sample/appsettings.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/css/site.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/css/site.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/css/site.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/css/site.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/favicon.ico b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/favicon.ico
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/favicon.ico
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/favicon.ico
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/js/site.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/js/site.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/js/site.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/js/site.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/LICENSE b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/LICENSE
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/LICENSE.md b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/LICENSE.md
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/LICENSE.txt b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/LICENSE.txt
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.js b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.js
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.map b/src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.map
rename to src/Services/auth/O2NextGen.Auth.Sample/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Data/AuthDbContext.cs b/src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Data/AuthDbContext.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Data/O2User.cs b/src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Data/O2User.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/20211107024126_InitDb.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs
similarity index 95%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/20211107024126_InitDb.Designer.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs
index 2a462134..79045a45 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/20211107024126_InitDb.Designer.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs
@@ -131,7 +131,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("O2NextGen.Auth.Data.O2User", b =>
+            modelBuilder.Entity("O2NextGen.Auth.Web.Data.O2User", b =>
                 {
                     b.Property<string>("Id")
                         .ValueGeneratedOnAdd();
@@ -192,7 +192,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -200,7 +200,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -213,7 +213,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoleId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -221,7 +221,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/20211107024126_InitDb.cs b/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/20211107024126_InitDb.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/AuthDbContextModelSnapshot.cs b/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs
similarity index 95%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/AuthDbContextModelSnapshot.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs
index 8b47e857..0ca88d1f 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Migrations/AuthDbContextModelSnapshot.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs
@@ -129,7 +129,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("O2NextGen.Auth.Data.O2User", b =>
+            modelBuilder.Entity("O2NextGen.Auth.Web.Data.O2User", b =>
                 {
                     b.Property<string>("Id")
                         .ValueGeneratedOnAdd();
@@ -190,7 +190,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -198,7 +198,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -211,7 +211,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("RoleId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -219,7 +219,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
                 {
-                    b.HasOne("O2NextGen.Auth.Data.O2User")
+                    b.HasOne("O2NextGen.Auth.Web.Data.O2User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/O2NextGen.Auth.csproj b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
similarity index 86%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/O2NextGen.Auth.csproj
rename to src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
index ac340e93..13e90c26 100644
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/O2NextGen.Auth.csproj
+++ b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <RootNamespace>O2NextGen.Auth</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/Register.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/Register.cshtml
rename to src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/Register.cshtml.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Pages/_ViewImports.cshtml
rename to src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Program.cs b/src/Services/auth/O2NextGen.Auth.Web/Program.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Program.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Program.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Properties/launchSettings.json b/src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Properties/launchSettings.json
rename to src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/Startup.cs
rename to src/Services/auth/O2NextGen.Auth.Web/Startup.cs
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/appsettings.Development.json b/src/Services/auth/O2NextGen.Auth.Web/appsettings.Development.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/appsettings.Development.json
rename to src/Services/auth/O2NextGen.Auth.Web/appsettings.Development.json
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/appsettings.json b/src/Services/auth/O2NextGen.Auth.Web/appsettings.json
similarity index 100%
rename from src/Services/auth/O2NextGen.Auth/O2NextGen.Auth/appsettings.json
rename to src/Services/auth/O2NextGen.Auth.Web/appsettings.json
diff --git a/src/Services/auth/O2NextGen.Auth.sln b/src/Services/auth/O2NextGen.Auth.sln
new file mode 100644
index 00000000..9bdbf634
--- /dev/null
+++ b/src/Services/auth/O2NextGen.Auth.sln
@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.810.11
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Auth.Web", "O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj", "{9558F553-05AB-44CE-A7D7-C44AB970A358}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.Auth.Reference", "O2NextGen.Auth.Sample\O2NextGen.Auth.Reference.csproj", "{286B8419-F5B7-443D-BDE6-509AC83052ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F27FA45B-F416-44AE-8A24-91AA3C4EBA39}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.Auth.Web", "Tests\IntegrationTests.O2NextGen.Auth.Web\IntegrationTests.O2NextGen.Auth.Web.csproj", "{297099E8-8227-4BC2-A537-2B8FAF41BB17}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.Auth.Web", "Tests\Tests.O2NextGen.Auth.Web\Tests.O2NextGen.Auth.Web.csproj", "{D0C86E83-9BAB-446C-906C-1AD166084612}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Temp", "Temp", "{1B2A171B-C30F-4CE1-9D02-F4CDC4C395FA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Release|Any CPU.Build.0 = Release|Any CPU
+		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{297099E8-8227-4BC2-A537-2B8FAF41BB17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{297099E8-8227-4BC2-A537-2B8FAF41BB17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{297099E8-8227-4BC2-A537-2B8FAF41BB17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{297099E8-8227-4BC2-A537-2B8FAF41BB17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0C86E83-9BAB-446C-906C-1AD166084612}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0C86E83-9BAB-446C-906C-1AD166084612}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0C86E83-9BAB-446C-906C-1AD166084612}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0C86E83-9BAB-446C-906C-1AD166084612}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EE27CEA0-1DC1-4C22-ABFF-A6A04EEE728D}
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{297099E8-8227-4BC2-A537-2B8FAF41BB17} = {F27FA45B-F416-44AE-8A24-91AA3C4EBA39}
+		{D0C86E83-9BAB-446C-906C-1AD166084612} = {F27FA45B-F416-44AE-8A24-91AA3C4EBA39}
+		{286B8419-F5B7-443D-BDE6-509AC83052ED} = {1B2A171B-C30F-4CE1-9D02-F4CDC4C395FA}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.sln b/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.sln
deleted file mode 100644
index f3eade4d..00000000
--- a/src/Services/auth/O2NextGen.Auth/O2NextGen.Auth.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.810.11
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Auth", "O2NextGen.Auth\O2NextGen.Auth.csproj", "{9558F553-05AB-44CE-A7D7-C44AB970A358}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.Auth.Reference", "O2NextGen.Auth.Sample\O2NextGen.Auth.Reference.csproj", "{286B8419-F5B7-443D-BDE6-509AC83052ED}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9558F553-05AB-44CE-A7D7-C44AB970A358}.Release|Any CPU.Build.0 = Release|Any CPU
-		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{286B8419-F5B7-443D-BDE6-509AC83052ED}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EE27CEA0-1DC1-4C22-ABFF-A6A04EEE728D}
-	EndGlobalSection
-EndGlobal
diff --git a/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj
new file mode 100644
index 00000000..37193f0b
--- /dev/null
+++ b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/IntegrationTests.O2NextGen.Auth.Web.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/UnitTest1.cs b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/UnitTest1.cs
new file mode 100644
index 00000000..5e7824ba
--- /dev/null
+++ b/src/Services/auth/Tests/IntegrationTests.O2NextGen.Auth.Web/UnitTest1.cs
@@ -0,0 +1,14 @@
+using System;
+using Xunit;
+
+namespace IntegrationTests.O2NextGen.Auth.Web
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+
+        }
+    }
+}
diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs
new file mode 100644
index 00000000..14291209
--- /dev/null
+++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs
@@ -0,0 +1,16 @@
+using NUnit.Framework;
+using O2NextGen.Auth.Pages;
+
+namespace Tests.O2NextGen.Auth.Web
+{
+    public class InputModelTests
+    {
+        [Test]
+        public void InputModel_Email_Test()
+        {
+            RegisterModel.InputModel model = new RegisterModel.InputModel();
+            model.Email = "demo@demo.com";
+            Assert.AreEqual("demo@demo.com",model.Email);
+        }
+    }
+}
diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
new file mode 100644
index 00000000..6e89463d
--- /dev/null
+++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/Tests.O2NextGen.Auth.Web.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\O2NextGen.Auth.Web\O2NextGen.Auth.Web.csproj" />
+  </ItemGroup>
+
+</Project>