diff --git a/Dockerfile b/Dockerfile
index a7c1311..e185e25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ WORKDIR /src
 COPY . .
 
 # Restore & publish (self-contained trimming can be added later if desired)
-RUN dotnet restore SimpleIdp.csproj
-RUN dotnet publish SimpleIdp.csproj -c $BUILD_CONFIGURATION -o /app/publish --no-restore
+RUN dotnet restore SimpleIdp.Server/SimpleIdp.csproj
+RUN dotnet publish SimpleIdp.Server/SimpleIdp.csproj -c $BUILD_CONFIGURATION -o /app/publish --no-restore
 
 # =========================
 # Runtime stage
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
deleted file mode 100644
index f01ca73..0000000
--- a/Properties/launchSettings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "SimpleIdp": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:65455;http://localhost:65456"
-    }
-  }
-}
\ No newline at end of file
diff --git a/Areas/console/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/console/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/console/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/console/Views/Authenticate/Index.cshtml
diff --git a/Areas/console/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/console/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/console/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/console/Views/_ViewImports.cshtml
diff --git a/Areas/mobile/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/mobile/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/mobile/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/mobile/Views/Authenticate/Index.cshtml
diff --git a/Areas/mobile/Views/Register/Index.cshtml b/SimpleIdp.Server/Areas/mobile/Views/Register/Index.cshtml
similarity index 100%
rename from Areas/mobile/Views/Register/Index.cshtml
rename to SimpleIdp.Server/Areas/mobile/Views/Register/Index.cshtml
diff --git a/Areas/mobile/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/mobile/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/mobile/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/mobile/Views/_ViewImports.cshtml
diff --git a/Areas/otp/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/otp/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/otp/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/otp/Views/Authenticate/Index.cshtml
diff --git a/Areas/otp/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/otp/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/otp/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/otp/Views/_ViewImports.cshtml
diff --git a/Areas/pwd/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/pwd/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/pwd/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/pwd/Views/Authenticate/Index.cshtml
diff --git a/Areas/pwd/Views/Register/Index.cshtml b/SimpleIdp.Server/Areas/pwd/Views/Register/Index.cshtml
similarity index 100%
rename from Areas/pwd/Views/Register/Index.cshtml
rename to SimpleIdp.Server/Areas/pwd/Views/Register/Index.cshtml
diff --git a/Areas/pwd/Views/Reset/Confirm.cshtml b/SimpleIdp.Server/Areas/pwd/Views/Reset/Confirm.cshtml
similarity index 100%
rename from Areas/pwd/Views/Reset/Confirm.cshtml
rename to SimpleIdp.Server/Areas/pwd/Views/Reset/Confirm.cshtml
diff --git a/Areas/pwd/Views/Reset/Index.cshtml b/SimpleIdp.Server/Areas/pwd/Views/Reset/Index.cshtml
similarity index 100%
rename from Areas/pwd/Views/Reset/Index.cshtml
rename to SimpleIdp.Server/Areas/pwd/Views/Reset/Index.cshtml
diff --git a/Areas/pwd/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/pwd/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/pwd/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/pwd/Views/_ViewImports.cshtml
diff --git a/Areas/sms/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/sms/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/sms/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/sms/Views/Authenticate/Index.cshtml
diff --git a/Areas/sms/Views/Register/Index.cshtml b/SimpleIdp.Server/Areas/sms/Views/Register/Index.cshtml
similarity index 100%
rename from Areas/sms/Views/Register/Index.cshtml
rename to SimpleIdp.Server/Areas/sms/Views/Register/Index.cshtml
diff --git a/Areas/sms/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/sms/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/sms/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/sms/Views/_ViewImports.cshtml
diff --git a/Areas/vp/Views/Register/Index.cshtml b/SimpleIdp.Server/Areas/vp/Views/Register/Index.cshtml
similarity index 100%
rename from Areas/vp/Views/Register/Index.cshtml
rename to SimpleIdp.Server/Areas/vp/Views/Register/Index.cshtml
diff --git a/Areas/vp/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/vp/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/vp/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/vp/Views/_ViewImports.cshtml
diff --git a/Areas/webauthn/Views/Authenticate/Index.cshtml b/SimpleIdp.Server/Areas/webauthn/Views/Authenticate/Index.cshtml
similarity index 100%
rename from Areas/webauthn/Views/Authenticate/Index.cshtml
rename to SimpleIdp.Server/Areas/webauthn/Views/Authenticate/Index.cshtml
diff --git a/Areas/webauthn/Views/Register/Index.cshtml b/SimpleIdp.Server/Areas/webauthn/Views/Register/Index.cshtml
similarity index 100%
rename from Areas/webauthn/Views/Register/Index.cshtml
rename to SimpleIdp.Server/Areas/webauthn/Views/Register/Index.cshtml
diff --git a/Areas/webauthn/Views/_ViewImports.cshtml b/SimpleIdp.Server/Areas/webauthn/Views/_ViewImports.cshtml
similarity index 100%
rename from Areas/webauthn/Views/_ViewImports.cshtml
rename to SimpleIdp.Server/Areas/webauthn/Views/_ViewImports.cshtml
diff --git a/Program.cs b/SimpleIdp.Server/Program.cs
similarity index 100%
rename from Program.cs
rename to SimpleIdp.Server/Program.cs
diff --git a/Resources/AccountsResource.Designer.cs b/SimpleIdp.Server/Resources/AccountsResource.Designer.cs
similarity index 100%
rename from Resources/AccountsResource.Designer.cs
rename to SimpleIdp.Server/Resources/AccountsResource.Designer.cs
diff --git a/Resources/AccountsResource.resx b/SimpleIdp.Server/Resources/AccountsResource.resx
similarity index 100%
rename from Resources/AccountsResource.resx
rename to SimpleIdp.Server/Resources/AccountsResource.resx
diff --git a/Resources/AuthenticateConsoleResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateConsoleResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateConsoleResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateConsoleResource.Designer.cs
diff --git a/Resources/AuthenticateConsoleResource.resx b/SimpleIdp.Server/Resources/AuthenticateConsoleResource.resx
similarity index 100%
rename from Resources/AuthenticateConsoleResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateConsoleResource.resx
diff --git a/Resources/AuthenticateEmailResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateEmailResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateEmailResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateEmailResource.Designer.cs
diff --git a/Resources/AuthenticateEmailResource.resx b/SimpleIdp.Server/Resources/AuthenticateEmailResource.resx
similarity index 100%
rename from Resources/AuthenticateEmailResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateEmailResource.resx
diff --git a/Resources/AuthenticateMobileResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateMobileResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateMobileResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateMobileResource.Designer.cs
diff --git a/Resources/AuthenticateMobileResource.resx b/SimpleIdp.Server/Resources/AuthenticateMobileResource.resx
similarity index 100%
rename from Resources/AuthenticateMobileResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateMobileResource.resx
diff --git a/Resources/AuthenticateOtpResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateOtpResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateOtpResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateOtpResource.Designer.cs
diff --git a/Resources/AuthenticateOtpResource.resx b/SimpleIdp.Server/Resources/AuthenticateOtpResource.resx
similarity index 100%
rename from Resources/AuthenticateOtpResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateOtpResource.resx
diff --git a/Resources/AuthenticatePasswordResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticatePasswordResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticatePasswordResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticatePasswordResource.Designer.cs
diff --git a/Resources/AuthenticatePasswordResource.resx b/SimpleIdp.Server/Resources/AuthenticatePasswordResource.resx
similarity index 100%
rename from Resources/AuthenticatePasswordResource.resx
rename to SimpleIdp.Server/Resources/AuthenticatePasswordResource.resx
diff --git a/Resources/AuthenticateSmsResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateSmsResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateSmsResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateSmsResource.Designer.cs
diff --git a/Resources/AuthenticateSmsResource.resx b/SimpleIdp.Server/Resources/AuthenticateSmsResource.resx
similarity index 100%
rename from Resources/AuthenticateSmsResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateSmsResource.resx
diff --git a/Resources/AuthenticateWebauthnResource.Designer.cs b/SimpleIdp.Server/Resources/AuthenticateWebauthnResource.Designer.cs
similarity index 100%
rename from Resources/AuthenticateWebauthnResource.Designer.cs
rename to SimpleIdp.Server/Resources/AuthenticateWebauthnResource.Designer.cs
diff --git a/Resources/AuthenticateWebauthnResource.resx b/SimpleIdp.Server/Resources/AuthenticateWebauthnResource.resx
similarity index 100%
rename from Resources/AuthenticateWebauthnResource.resx
rename to SimpleIdp.Server/Resources/AuthenticateWebauthnResource.resx
diff --git a/Resources/BCConsentsResource.Designer.cs b/SimpleIdp.Server/Resources/BCConsentsResource.Designer.cs
similarity index 100%
rename from Resources/BCConsentsResource.Designer.cs
rename to SimpleIdp.Server/Resources/BCConsentsResource.Designer.cs
diff --git a/Resources/BCConsentsResource.resx b/SimpleIdp.Server/Resources/BCConsentsResource.resx
similarity index 100%
rename from Resources/BCConsentsResource.resx
rename to SimpleIdp.Server/Resources/BCConsentsResource.resx
diff --git a/Resources/CheckSessionResource.Designer.cs b/SimpleIdp.Server/Resources/CheckSessionResource.Designer.cs
similarity index 100%
rename from Resources/CheckSessionResource.Designer.cs
rename to SimpleIdp.Server/Resources/CheckSessionResource.Designer.cs
diff --git a/Resources/CheckSessionResource.resx b/SimpleIdp.Server/Resources/CheckSessionResource.resx
similarity index 100%
rename from Resources/CheckSessionResource.resx
rename to SimpleIdp.Server/Resources/CheckSessionResource.resx
diff --git a/Resources/ConfirmResetPasswordResource.Designer.cs b/SimpleIdp.Server/Resources/ConfirmResetPasswordResource.Designer.cs
similarity index 100%
rename from Resources/ConfirmResetPasswordResource.Designer.cs
rename to SimpleIdp.Server/Resources/ConfirmResetPasswordResource.Designer.cs
diff --git a/Resources/ConfirmResetPasswordResource.resx b/SimpleIdp.Server/Resources/ConfirmResetPasswordResource.resx
similarity index 100%
rename from Resources/ConfirmResetPasswordResource.resx
rename to SimpleIdp.Server/Resources/ConfirmResetPasswordResource.resx
diff --git a/Resources/ConsentsResource.Designer.cs b/SimpleIdp.Server/Resources/ConsentsResource.Designer.cs
similarity index 100%
rename from Resources/ConsentsResource.Designer.cs
rename to SimpleIdp.Server/Resources/ConsentsResource.Designer.cs
diff --git a/Resources/ConsentsResource.resx b/SimpleIdp.Server/Resources/ConsentsResource.resx
similarity index 100%
rename from Resources/ConsentsResource.resx
rename to SimpleIdp.Server/Resources/ConsentsResource.resx
diff --git a/Resources/CredentialsResource.Designer.cs b/SimpleIdp.Server/Resources/CredentialsResource.Designer.cs
similarity index 100%
rename from Resources/CredentialsResource.Designer.cs
rename to SimpleIdp.Server/Resources/CredentialsResource.Designer.cs
diff --git a/Resources/CredentialsResource.resx b/SimpleIdp.Server/Resources/CredentialsResource.resx
similarity index 100%
rename from Resources/CredentialsResource.resx
rename to SimpleIdp.Server/Resources/CredentialsResource.resx
diff --git a/Resources/DeviceCodeResource.Designer.cs b/SimpleIdp.Server/Resources/DeviceCodeResource.Designer.cs
similarity index 100%
rename from Resources/DeviceCodeResource.Designer.cs
rename to SimpleIdp.Server/Resources/DeviceCodeResource.Designer.cs
diff --git a/Resources/DeviceCodeResource.resx b/SimpleIdp.Server/Resources/DeviceCodeResource.resx
similarity index 100%
rename from Resources/DeviceCodeResource.resx
rename to SimpleIdp.Server/Resources/DeviceCodeResource.resx
diff --git a/Resources/ErrorsResource.Designer.cs b/SimpleIdp.Server/Resources/ErrorsResource.Designer.cs
similarity index 100%
rename from Resources/ErrorsResource.Designer.cs
rename to SimpleIdp.Server/Resources/ErrorsResource.Designer.cs
diff --git a/Resources/ErrorsResource.resx b/SimpleIdp.Server/Resources/ErrorsResource.resx
similarity index 100%
rename from Resources/ErrorsResource.resx
rename to SimpleIdp.Server/Resources/ErrorsResource.resx
diff --git a/Resources/HomeResource.Designer.cs b/SimpleIdp.Server/Resources/HomeResource.Designer.cs
similarity index 100%
rename from Resources/HomeResource.Designer.cs
rename to SimpleIdp.Server/Resources/HomeResource.Designer.cs
diff --git a/Resources/HomeResource.resx b/SimpleIdp.Server/Resources/HomeResource.resx
similarity index 100%
rename from Resources/HomeResource.resx
rename to SimpleIdp.Server/Resources/HomeResource.resx
diff --git a/Resources/LayoutResource.Designer.cs b/SimpleIdp.Server/Resources/LayoutResource.Designer.cs
similarity index 100%
rename from Resources/LayoutResource.Designer.cs
rename to SimpleIdp.Server/Resources/LayoutResource.Designer.cs
diff --git a/Resources/LayoutResource.resx b/SimpleIdp.Server/Resources/LayoutResource.resx
similarity index 100%
rename from Resources/LayoutResource.resx
rename to SimpleIdp.Server/Resources/LayoutResource.resx
diff --git a/Resources/ProfileResource.Designer.cs b/SimpleIdp.Server/Resources/ProfileResource.Designer.cs
similarity index 100%
rename from Resources/ProfileResource.Designer.cs
rename to SimpleIdp.Server/Resources/ProfileResource.Designer.cs
diff --git a/Resources/ProfileResource.resx b/SimpleIdp.Server/Resources/ProfileResource.resx
similarity index 100%
rename from Resources/ProfileResource.resx
rename to SimpleIdp.Server/Resources/ProfileResource.resx
diff --git a/Resources/RegisterEmailResource.Designer.cs b/SimpleIdp.Server/Resources/RegisterEmailResource.Designer.cs
similarity index 100%
rename from Resources/RegisterEmailResource.Designer.cs
rename to SimpleIdp.Server/Resources/RegisterEmailResource.Designer.cs
diff --git a/Resources/RegisterEmailResource.resx b/SimpleIdp.Server/Resources/RegisterEmailResource.resx
similarity index 100%
rename from Resources/RegisterEmailResource.resx
rename to SimpleIdp.Server/Resources/RegisterEmailResource.resx
diff --git a/Resources/RegisterPwdResource.Designer.cs b/SimpleIdp.Server/Resources/RegisterPwdResource.Designer.cs
similarity index 100%
rename from Resources/RegisterPwdResource.Designer.cs
rename to SimpleIdp.Server/Resources/RegisterPwdResource.Designer.cs
diff --git a/Resources/RegisterPwdResource.resx b/SimpleIdp.Server/Resources/RegisterPwdResource.resx
similarity index 100%
rename from Resources/RegisterPwdResource.resx
rename to SimpleIdp.Server/Resources/RegisterPwdResource.resx
diff --git a/Resources/RegisterSmsResource.Designer.cs b/SimpleIdp.Server/Resources/RegisterSmsResource.Designer.cs
similarity index 100%
rename from Resources/RegisterSmsResource.Designer.cs
rename to SimpleIdp.Server/Resources/RegisterSmsResource.Designer.cs
diff --git a/Resources/RegisterSmsResource.resx b/SimpleIdp.Server/Resources/RegisterSmsResource.resx
similarity index 100%
rename from Resources/RegisterSmsResource.resx
rename to SimpleIdp.Server/Resources/RegisterSmsResource.resx
diff --git a/Resources/RegisterVpResource.Designer.cs b/SimpleIdp.Server/Resources/RegisterVpResource.Designer.cs
similarity index 100%
rename from Resources/RegisterVpResource.Designer.cs
rename to SimpleIdp.Server/Resources/RegisterVpResource.Designer.cs
diff --git a/Resources/RegisterVpResource.resx b/SimpleIdp.Server/Resources/RegisterVpResource.resx
similarity index 100%
rename from Resources/RegisterVpResource.resx
rename to SimpleIdp.Server/Resources/RegisterVpResource.resx
diff --git a/Resources/ResetPasswordResource.Designer.cs b/SimpleIdp.Server/Resources/ResetPasswordResource.Designer.cs
similarity index 100%
rename from Resources/ResetPasswordResource.Designer.cs
rename to SimpleIdp.Server/Resources/ResetPasswordResource.Designer.cs
diff --git a/Resources/ResetPasswordResource.resx b/SimpleIdp.Server/Resources/ResetPasswordResource.resx
similarity index 100%
rename from Resources/ResetPasswordResource.resx
rename to SimpleIdp.Server/Resources/ResetPasswordResource.resx
diff --git a/Resources/ScopesResource.Designer.cs b/SimpleIdp.Server/Resources/ScopesResource.Designer.cs
similarity index 100%
rename from Resources/ScopesResource.Designer.cs
rename to SimpleIdp.Server/Resources/ScopesResource.Designer.cs
diff --git a/Resources/ScopesResource.resx b/SimpleIdp.Server/Resources/ScopesResource.resx
similarity index 100%
rename from Resources/ScopesResource.resx
rename to SimpleIdp.Server/Resources/ScopesResource.resx
diff --git a/Resources/SessionsResource.Designer.cs b/SimpleIdp.Server/Resources/SessionsResource.Designer.cs
similarity index 100%
rename from Resources/SessionsResource.Designer.cs
rename to SimpleIdp.Server/Resources/SessionsResource.Designer.cs
diff --git a/Resources/SessionsResource.resx b/SimpleIdp.Server/Resources/SessionsResource.resx
similarity index 100%
rename from Resources/SessionsResource.resx
rename to SimpleIdp.Server/Resources/SessionsResource.resx
diff --git a/SimpleIdp.csproj b/SimpleIdp.Server/SimpleIdp.csproj
similarity index 99%
rename from SimpleIdp.csproj
rename to SimpleIdp.Server/SimpleIdp.csproj
index fe2b7e9..00f3eaa 100644
--- a/SimpleIdp.csproj
+++ b/SimpleIdp.Server/SimpleIdp.csproj
@@ -249,4 +249,4 @@
 	    <Generator>PublicResXFileCodeGenerator</Generator>
 	  </EmbeddedResource>
 	</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Views/Accounts/Index.cshtml b/SimpleIdp.Server/Views/Accounts/Index.cshtml
similarity index 100%
rename from Views/Accounts/Index.cshtml
rename to SimpleIdp.Server/Views/Accounts/Index.cshtml
diff --git a/Views/BackChannelConsents/Index.cshtml b/SimpleIdp.Server/Views/BackChannelConsents/Index.cshtml
similarity index 100%
rename from Views/BackChannelConsents/Index.cshtml
rename to SimpleIdp.Server/Views/BackChannelConsents/Index.cshtml
diff --git a/Views/CheckSession/EndSession.cshtml b/SimpleIdp.Server/Views/CheckSession/EndSession.cshtml
similarity index 100%
rename from Views/CheckSession/EndSession.cshtml
rename to SimpleIdp.Server/Views/CheckSession/EndSession.cshtml
diff --git a/Views/Consents/Index.cshtml b/SimpleIdp.Server/Views/Consents/Index.cshtml
similarity index 100%
rename from Views/Consents/Index.cshtml
rename to SimpleIdp.Server/Views/Consents/Index.cshtml
diff --git a/Views/Device/Index.cshtml b/SimpleIdp.Server/Views/Device/Index.cshtml
similarity index 100%
rename from Views/Device/Index.cshtml
rename to SimpleIdp.Server/Views/Device/Index.cshtml
diff --git a/Views/Errors/Index.cshtml b/SimpleIdp.Server/Views/Errors/Index.cshtml
similarity index 100%
rename from Views/Errors/Index.cshtml
rename to SimpleIdp.Server/Views/Errors/Index.cshtml
diff --git a/Views/Errors/Unexpected.cshtml b/SimpleIdp.Server/Views/Errors/Unexpected.cshtml
similarity index 100%
rename from Views/Errors/Unexpected.cshtml
rename to SimpleIdp.Server/Views/Errors/Unexpected.cshtml
diff --git a/Views/Home/Disconnect.cshtml b/SimpleIdp.Server/Views/Home/Disconnect.cshtml
similarity index 100%
rename from Views/Home/Disconnect.cshtml
rename to SimpleIdp.Server/Views/Home/Disconnect.cshtml
diff --git a/Views/Home/Index.cshtml b/SimpleIdp.Server/Views/Home/Index.cshtml
similarity index 100%
rename from Views/Home/Index.cshtml
rename to SimpleIdp.Server/Views/Home/Index.cshtml
diff --git a/Views/Home/Profile.cshtml b/SimpleIdp.Server/Views/Home/Profile.cshtml
similarity index 100%
rename from Views/Home/Profile.cshtml
rename to SimpleIdp.Server/Views/Home/Profile.cshtml
diff --git a/Views/Sessions/Index.cshtml b/SimpleIdp.Server/Views/Sessions/Index.cshtml
similarity index 100%
rename from Views/Sessions/Index.cshtml
rename to SimpleIdp.Server/Views/Sessions/Index.cshtml
diff --git a/Views/Shared/_CommonLayout.cshtml b/SimpleIdp.Server/Views/Shared/_CommonLayout.cshtml
similarity index 100%
rename from Views/Shared/_CommonLayout.cshtml
rename to SimpleIdp.Server/Views/Shared/_CommonLayout.cshtml
diff --git a/Views/Shared/_FormBuilderLayout.cshtml b/SimpleIdp.Server/Views/Shared/_FormBuilderLayout.cshtml
similarity index 100%
rename from Views/Shared/_FormBuilderLayout.cshtml
rename to SimpleIdp.Server/Views/Shared/_FormBuilderLayout.cshtml
diff --git a/Views/Shared/_Layout.cshtml b/SimpleIdp.Server/Views/Shared/_Layout.cshtml
similarity index 100%
rename from Views/Shared/_Layout.cshtml
rename to SimpleIdp.Server/Views/Shared/_Layout.cshtml
diff --git a/config/idp-config.json b/SimpleIdp.Server/config/idp-config.json
similarity index 100%
rename from config/idp-config.json
rename to SimpleIdp.Server/config/idp-config.json
diff --git a/SimpleIdp.Server/libman.json b/SimpleIdp.Server/libman.json
new file mode 100644
index 0000000..bb533f3
--- /dev/null
+++ b/SimpleIdp.Server/libman.json
@@ -0,0 +1,22 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": [
+    {
+      "library": "jquery@3.6.3",
+      "destination": "wwwroot/lib/jquery/"
+    },
+    {
+      "library": "bootstrap@5.2.3",
+      "destination": "wwwroot/lib/bootstrap/"
+    },
+    {
+      "library": "popper.js@2.11.6",
+      "destination": "wwwroot/lib/popper.js/"
+    },
+    {
+      "library": "font-awesome@6.5.2",
+      "destination": "wwwroot/lib/fontawesome/"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/wwwroot/images/DefaultClient.png b/SimpleIdp.Server/wwwroot/images/DefaultClient.png
similarity index 100%
rename from wwwroot/images/DefaultClient.png
rename to SimpleIdp.Server/wwwroot/images/DefaultClient.png
diff --git a/wwwroot/images/DefaultUser.png b/SimpleIdp.Server/wwwroot/images/DefaultUser.png
similarity index 100%
rename from wwwroot/images/DefaultUser.png
rename to SimpleIdp.Server/wwwroot/images/DefaultUser.png
diff --git a/wwwroot/images/SIDLogo.svg b/SimpleIdp.Server/wwwroot/images/SIDLogo.svg
similarity index 100%
rename from wwwroot/images/SIDLogo.svg
rename to SimpleIdp.Server/wwwroot/images/SIDLogo.svg
diff --git a/wwwroot/images/favicon.ico b/SimpleIdp.Server/wwwroot/images/favicon.ico
similarity index 100%
rename from wwwroot/images/favicon.ico
rename to SimpleIdp.Server/wwwroot/images/favicon.ico
diff --git a/wwwroot/styles/authenticate.css b/SimpleIdp.Server/wwwroot/styles/authenticate.css
similarity index 100%
rename from wwwroot/styles/authenticate.css
rename to SimpleIdp.Server/wwwroot/styles/authenticate.css
diff --git a/wwwroot/styles/consent.css b/SimpleIdp.Server/wwwroot/styles/consent.css
similarity index 100%
rename from wwwroot/styles/consent.css
rename to SimpleIdp.Server/wwwroot/styles/consent.css
diff --git a/wwwroot/styles/profile.css b/SimpleIdp.Server/wwwroot/styles/profile.css
similarity index 100%
rename from wwwroot/styles/profile.css
rename to SimpleIdp.Server/wwwroot/styles/profile.css
diff --git a/wwwroot/styles/theme.css b/SimpleIdp.Server/wwwroot/styles/theme.css
similarity index 100%
rename from wwwroot/styles/theme.css
rename to SimpleIdp.Server/wwwroot/styles/theme.css
diff --git a/SimpleIdp.sln b/SimpleIdp.sln
index 594fdbc..d22d2d7 100644
--- a/SimpleIdp.sln
+++ b/SimpleIdp.sln
@@ -1,11 +1,10 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.2.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleIdp", "SimpleIdp.csproj", "{C962C62B-F4DA-ED13-F4C4-819534040A9C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleIdp", "SimpleIdp.Server/SimpleIdp.csproj", "{C962C62B-F4DA-ED13-F4C4-819534040A9C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleIdp.Tests", "SimpleIdp.Tests\SimpleIdp.Tests.csproj", "{336AC621-0811-4B37-9958-8C6EA6422DDA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleIdp.Tests", "SimpleIdp.Tests/SimpleIdp.Tests.csproj", "{336AC621-0811-4B37-9958-8C6EA6422DDA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,7 +20,7 @@ Global
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Debug|x64.Build.0 = Debug|Any CPU
-		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C962C62B-F4DA-ED13-F4C4-8195340A9C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Debug|x86.Build.0 = Debug|Any CPU
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C962C62B-F4DA-ED13-F4C4-819534040A9C}.Release|Any CPU.Build.0 = Release|Any CPU