diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
index c2e32619e5f92..6633ef917b7ec 100644
--- a/site/src/AppRouter.tsx
+++ b/site/src/AppRouter.tsx
@@ -8,11 +8,11 @@ import { NotFoundPage } from "./pages/404Page/404Page"
 import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage"
 import { HealthzPage } from "./pages/HealthzPage/HealthzPage"
 import { LoginPage } from "./pages/LoginPage/LoginPage"
-import { AccountPage } from "./pages/SettingsPages/AccountPage/AccountPage"
-import { SecurityPage } from "./pages/SettingsPages/SecurityPage/SecurityPage"
-import { SSHKeysPage } from "./pages/SettingsPages/SSHKeysPage/SSHKeysPage"
 import { TemplatePage } from "./pages/TemplatePage/TemplatePage"
 import TemplatesPage from "./pages/TemplatesPage/TemplatesPage"
+import { AccountPage } from "./pages/UserSettingsPage/AccountPage/AccountPage"
+import { SecurityPage } from "./pages/UserSettingsPage/SecurityPage/SecurityPage"
+import { SSHKeysPage } from "./pages/UserSettingsPage/SSHKeysPage/SSHKeysPage"
 import { CreateUserPage } from "./pages/UsersPage/CreateUserPage/CreateUserPage"
 import { UsersPage } from "./pages/UsersPage/UsersPage"
 import { WorkspaceBuildPage } from "./pages/WorkspaceBuildPage/WorkspaceBuildPage"
diff --git a/site/src/pages/SettingsPages/AccountPage/AccountPage.test.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountPage.test.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/AccountPage/AccountPage.test.tsx
rename to site/src/pages/UserSettingsPage/AccountPage/AccountPage.test.tsx
diff --git a/site/src/pages/SettingsPages/AccountPage/AccountPage.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/AccountPage/AccountPage.tsx
rename to site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx
diff --git a/site/src/pages/SettingsPages/SSHKeysPage/SSHKeysPage.test.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/SSHKeysPage/SSHKeysPage.test.tsx
rename to site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx
diff --git a/site/src/pages/SettingsPages/SSHKeysPage/SSHKeysPage.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/SSHKeysPage/SSHKeysPage.tsx
rename to site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.tsx
diff --git a/site/src/pages/SettingsPages/SecurityPage/SecurityPage.test.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/SecurityPage/SecurityPage.test.tsx
rename to site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
diff --git a/site/src/pages/SettingsPages/SecurityPage/SecurityPage.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx
similarity index 100%
rename from site/src/pages/SettingsPages/SecurityPage/SecurityPage.tsx
rename to site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.tsx