diff --git a/samples.slnx b/samples.slnx
index 98da2fd8..f54718c7 100644
--- a/samples.slnx
+++ b/samples.slnx
@@ -673,17 +673,20 @@
     <Project Path="IdentityServer/v8/SAML/IdPInitiated/IdentityServerHost/IdentityServerHost.csproj" />
     <Project Path="IdentityServer/v8/SAML/IdPInitiated/ServiceProvider/ServiceProvider.csproj" />
   </Folder>
-  <Folder Name="/IdentityServer/v8/UserManagement/">
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample.AppHost/UserManagementSample.AppHost.csproj" />
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample.AspNetIdentitySource/UserManagementSample.AspNetIdentitySource.csproj" />
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample.Client/UserManagementSample.Client.csproj" />
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample.GettingStarted/UserManagementSample.GettingStarted.csproj" />
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample.ServiceDefaults/UserManagementSample.ServiceDefaults.csproj" />
-    <Project Path="IdentityServer/v8/UserManagement/UserManagementSample/UserManagementSample.csproj" />
-  </Folder>
-  <Folder Name="/IdentityServer/v8/UserManagementPasswordRegistration/">
-    <Project Path="IdentityServer/v8/UserManagementPasswordRegistration/UserManagementPasswordRegistration.AppHost/UserManagementPasswordRegistration.AppHost.csproj" />
-    <Project Path="IdentityServer/v8/UserManagementPasswordRegistration/UserManagementPasswordRegistration/UserManagementPasswordRegistration.csproj" />
+  <Folder Name="/IdentityServer/v8/UserManagement/" />
+  <Folder Name="/IdentityServer/v8/UserManagement/FullSample/">
+    <Project Path="IdentityServer/v8/UserManagement/FullSample/UserManagementSample.AppHost/UserManagementSample.AppHost.csproj" />
+    <Project Path="IdentityServer/v8/UserManagement/FullSample/UserManagementSample.AspNetIdentitySource/UserManagementSample.AspNetIdentitySource.csproj" />
+    <Project Path="IdentityServer/v8/UserManagement/FullSample/UserManagementSample.Client/UserManagementSample.Client.csproj" />
+    <Project Path="IdentityServer/v8/UserManagement/FullSample/UserManagementSample.ServiceDefaults/UserManagementSample.ServiceDefaults.csproj" />
+    <Project Path="IdentityServer/v8/UserManagement/FullSample/UserManagementSample/UserManagementSample.csproj" />
+  </Folder>
+  <Folder Name="/IdentityServer/v8/UserManagement/GettingStarted/">
+    <Project Path="IdentityServer/v8/UserManagement/GettingStarted/GettingStarted.csproj" />
+  </Folder>
+  <Folder Name="/IdentityServer/v8/UserManagement/PasswordRegistration/">
+    <Project Path="IdentityServer/v8/UserManagement/PasswordRegistration/PasswordRegistration.AppHost/PasswordRegistration.AppHost.csproj" />
+    <Project Path="IdentityServer/v8/UserManagement/PasswordRegistration/PasswordRegistration/PasswordRegistration.csproj" />
   </Folder>
   <Folder Name="/various/" />
   <Folder Name="/various/clients/" />