diff --git a/src/Squidex/Controllers/UI/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Account/AccountController.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
diff --git a/src/Squidex/Controllers/UI/Account/LoginModel.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/LoginModel.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Account/LoginModel.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Account/LoginModel.cs
diff --git a/src/Squidex/Controllers/UI/Account/LoginVM.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/LoginVM.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Account/LoginVM.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Account/LoginVM.cs
diff --git a/src/Squidex/Controllers/UI/Error/ErrorController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Error/ErrorController.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Error/ErrorController.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Error/ErrorController.cs
diff --git a/src/Squidex/Controllers/UI/Extensions.cs b/src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Extensions.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Extensions.cs
diff --git a/src/Squidex/Controllers/UI/ExternalProvider.cs b/src/Squidex/Areas/IdentityServer/Controllers/ExternalProvider.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/ExternalProvider.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/ExternalProvider.cs
diff --git a/src/Squidex/Controllers/UI/Profile/ChangePasswordModel.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangePasswordModel.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/ChangePasswordModel.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangePasswordModel.cs
diff --git a/src/Squidex/Controllers/UI/Profile/ChangeProfileModel.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangeProfileModel.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/ChangeProfileModel.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/ChangeProfileModel.cs
diff --git a/src/Squidex/Controllers/UI/Profile/PortalController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/PortalController.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/PortalController.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/PortalController.cs
diff --git a/src/Squidex/Controllers/UI/Profile/ProfileController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/ProfileController.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs
diff --git a/src/Squidex/Controllers/UI/Profile/ProfileVM.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileVM.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/ProfileVM.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileVM.cs
diff --git a/src/Squidex/Controllers/UI/Profile/RemoveLoginModel.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/RemoveLoginModel.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/RemoveLoginModel.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/RemoveLoginModel.cs
diff --git a/src/Squidex/Controllers/UI/Profile/SetPasswordModel.cs b/src/Squidex/Areas/IdentityServer/Controllers/Profile/SetPasswordModel.cs
similarity index 100%
rename from src/Squidex/Controllers/UI/Profile/SetPasswordModel.cs
rename to src/Squidex/Areas/IdentityServer/Controllers/Profile/SetPasswordModel.cs
diff --git a/src/Squidex/Views/Account/AccessDenied.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml
similarity index 100%
rename from src/Squidex/Views/Account/AccessDenied.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Account/AccessDenied.cshtml
diff --git a/src/Squidex/Views/Account/LockedOut.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml
similarity index 100%
rename from src/Squidex/Views/Account/LockedOut.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Account/LockedOut.cshtml
diff --git a/src/Squidex/Views/Account/Login.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
similarity index 100%
rename from src/Squidex/Views/Account/Login.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
diff --git a/src/Squidex/Views/Account/LogoutCompleted.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
similarity index 100%
rename from src/Squidex/Views/Account/LogoutCompleted.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Account/LogoutCompleted.cshtml
diff --git a/src/Squidex/Views/Error/Error.cshtml b/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
similarity index 100%
rename from src/Squidex/Views/Error/Error.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
diff --git a/src/Squidex/Views/Profile/Profile.cshtml b/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml
similarity index 100%
rename from src/Squidex/Views/Profile/Profile.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml
diff --git a/src/Squidex/Views/Shared/Docs.cshtml b/src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml
similarity index 100%
rename from src/Squidex/Views/Shared/Docs.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/Shared/Docs.cshtml
diff --git a/src/Squidex/Views/_Layout.cshtml b/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
similarity index 100%
rename from src/Squidex/Views/_Layout.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml
diff --git a/src/Squidex/Views/_ViewImports.cshtml b/src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml
similarity index 100%
rename from src/Squidex/Views/_ViewImports.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/_ViewImports.cshtml
diff --git a/src/Squidex/Views/_ViewStart.cshtml b/src/Squidex/Areas/IdentityServer/Views/_ViewStart.cshtml
similarity index 100%
rename from src/Squidex/Views/_ViewStart.cshtml
rename to src/Squidex/Areas/IdentityServer/Views/_ViewStart.cshtml
diff --git a/src/Squidex/Views/Account/ClientPopup.cshtml b/src/Squidex/Views/Account/ClientPopup.cshtml
deleted file mode 100644
index 40d3af684..000000000
--- a/src/Squidex/Views/Account/ClientPopup.cshtml
+++ /dev/null
@@ -1,16 +0,0 @@
-@{
-    Layout = null;
-}
-
-<!DOCTYPE html>
-<html>
-    <body>
-        <script src='~/scripts/oidc-client.min.js'></script>
-        <script>
-            Oidc.Log.logger = console;
-            Oidc.Log.logLevel = Oidc.Log.INFO;
-
-            new Oidc.UserManager().signinPopupCallback();
-        </script>
-    </body>
-</html>
diff --git a/src/Squidex/Views/Account/ClientSilent.cshtml b/src/Squidex/Views/Account/ClientSilent.cshtml
deleted file mode 100644
index 39f659cb3..000000000
--- a/src/Squidex/Views/Account/ClientSilent.cshtml
+++ /dev/null
@@ -1,16 +0,0 @@
-@{
-    Layout = null;
-}
-
-<!DOCTYPE html>
-<html>
-    <body>
-        <script src='~/scripts/oidc-client.min.js'></script>
-        <script>
-            Oidc.Log.logger = console;
-            Oidc.Log.logLevel = Oidc.Log.INFO;
-
-            new Oidc.UserManager().signinSilentCallback();
-        </script>
-    </body>
-</html>