diff --git a/client/hosting/overview/components/hosting-overview.tsx b/client/hosting/overview/components/hosting-overview.tsx
index 59721e475d6b4..840baead5fdb9 100644
--- a/client/hosting/overview/components/hosting-overview.tsx
+++ b/client/hosting/overview/components/hosting-overview.tsx
@@ -5,7 +5,7 @@ import ActiveDomainsCard from 'calypso/hosting/overview/components/active-domain
 import PlanCard from 'calypso/hosting/overview/components/plan-card';
 import QuickActionsCard from 'calypso/hosting/overview/components/quick-actions-card';
 import SiteBackupCard from 'calypso/hosting/overview/components/site-backup-card';
-import SupportCard from 'calypso/hosting/server-settings/support-card';
+import SupportCard from 'calypso/hosting/server-settings/components/support-card';
 import { isNotAtomicJetpack } from 'calypso/sites-dashboard/utils';
 import { useSelector } from 'calypso/state';
 import { getSelectedSite } from 'calypso/state/ui/selectors';
diff --git a/client/hosting/server-settings/cache-card/edge-cache-loading-placeholder.tsx b/client/hosting/server-settings/components/cache-card/edge-cache-loading-placeholder.tsx
similarity index 100%
rename from client/hosting/server-settings/cache-card/edge-cache-loading-placeholder.tsx
rename to client/hosting/server-settings/components/cache-card/edge-cache-loading-placeholder.tsx
diff --git a/client/hosting/server-settings/cache-card/index.js b/client/hosting/server-settings/components/cache-card/index.js
similarity index 100%
rename from client/hosting/server-settings/cache-card/index.js
rename to client/hosting/server-settings/components/cache-card/index.js
diff --git a/client/hosting/server-settings/cache-card/test/index.js b/client/hosting/server-settings/components/cache-card/test/index.js
similarity index 100%
rename from client/hosting/server-settings/cache-card/test/index.js
rename to client/hosting/server-settings/components/cache-card/test/index.js
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-cloud.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-cloud.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-cloud.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-cloud.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-comments.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-comments.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-comments.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-comments.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-database.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-database.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-database.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-database.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-server-racks.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-server-racks.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-server-racks.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-server-racks.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-ssh.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-ssh.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-ssh.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-ssh.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/icons/icon-terminal.svg b/client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-terminal.svg
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/icons/icon-terminal.svg
rename to client/hosting/server-settings/components/hosting-upsell-nudge/icons/icon-terminal.svg
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/index.tsx b/client/hosting/server-settings/components/hosting-upsell-nudge/index.tsx
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/index.tsx
rename to client/hosting/server-settings/components/hosting-upsell-nudge/index.tsx
diff --git a/client/hosting/server-settings/hosting-upsell-nudge/style.scss b/client/hosting/server-settings/components/hosting-upsell-nudge/style.scss
similarity index 100%
rename from client/hosting/server-settings/hosting-upsell-nudge/style.scss
rename to client/hosting/server-settings/components/hosting-upsell-nudge/style.scss
diff --git a/client/hosting/server-settings/phpmyadmin-card/index.js b/client/hosting/server-settings/components/phpmyadmin-card/index.js
similarity index 100%
rename from client/hosting/server-settings/phpmyadmin-card/index.js
rename to client/hosting/server-settings/components/phpmyadmin-card/index.js
diff --git a/client/hosting/server-settings/phpmyadmin-card/restore-db-password.js b/client/hosting/server-settings/components/phpmyadmin-card/restore-db-password.js
similarity index 100%
rename from client/hosting/server-settings/phpmyadmin-card/restore-db-password.js
rename to client/hosting/server-settings/components/phpmyadmin-card/restore-db-password.js
diff --git a/client/hosting/server-settings/phpmyadmin-card/style.scss b/client/hosting/server-settings/components/phpmyadmin-card/style.scss
similarity index 100%
rename from client/hosting/server-settings/phpmyadmin-card/style.scss
rename to client/hosting/server-settings/components/phpmyadmin-card/style.scss
diff --git a/client/hosting/server-settings/restore-plan-software-card/index.js b/client/hosting/server-settings/components/restore-plan-software-card/index.js
similarity index 100%
rename from client/hosting/server-settings/restore-plan-software-card/index.js
rename to client/hosting/server-settings/components/restore-plan-software-card/index.js
diff --git a/client/hosting/server-settings/sftp-card/index.js b/client/hosting/server-settings/components/sftp-card/index.js
similarity index 100%
rename from client/hosting/server-settings/sftp-card/index.js
rename to client/hosting/server-settings/components/sftp-card/index.js
diff --git a/client/hosting/server-settings/sftp-card/sftp-card-loading-placeholder.tsx b/client/hosting/server-settings/components/sftp-card/sftp-card-loading-placeholder.tsx
similarity index 100%
rename from client/hosting/server-settings/sftp-card/sftp-card-loading-placeholder.tsx
rename to client/hosting/server-settings/components/sftp-card/sftp-card-loading-placeholder.tsx
diff --git a/client/hosting/server-settings/sftp-card/ssh-key-card.tsx b/client/hosting/server-settings/components/sftp-card/ssh-key-card.tsx
similarity index 100%
rename from client/hosting/server-settings/sftp-card/ssh-key-card.tsx
rename to client/hosting/server-settings/components/sftp-card/ssh-key-card.tsx
diff --git a/client/hosting/server-settings/sftp-card/ssh-keys.scss b/client/hosting/server-settings/components/sftp-card/ssh-keys.scss
similarity index 100%
rename from client/hosting/server-settings/sftp-card/ssh-keys.scss
rename to client/hosting/server-settings/components/sftp-card/ssh-keys.scss
diff --git a/client/hosting/server-settings/sftp-card/ssh-keys.tsx b/client/hosting/server-settings/components/sftp-card/ssh-keys.tsx
similarity index 100%
rename from client/hosting/server-settings/sftp-card/ssh-keys.tsx
rename to client/hosting/server-settings/components/sftp-card/ssh-keys.tsx
diff --git a/client/hosting/server-settings/sftp-card/test/index.js b/client/hosting/server-settings/components/sftp-card/test/index.js
similarity index 100%
rename from client/hosting/server-settings/sftp-card/test/index.js
rename to client/hosting/server-settings/components/sftp-card/test/index.js
diff --git a/client/hosting/server-settings/sftp-card/use-atomic-ssh-keys.ts b/client/hosting/server-settings/components/sftp-card/use-atomic-ssh-keys.ts
similarity index 100%
rename from client/hosting/server-settings/sftp-card/use-atomic-ssh-keys.ts
rename to client/hosting/server-settings/components/sftp-card/use-atomic-ssh-keys.ts
diff --git a/client/hosting/server-settings/sftp-card/use-attach-ssh-key.ts b/client/hosting/server-settings/components/sftp-card/use-attach-ssh-key.ts
similarity index 100%
rename from client/hosting/server-settings/sftp-card/use-attach-ssh-key.ts
rename to client/hosting/server-settings/components/sftp-card/use-attach-ssh-key.ts
diff --git a/client/hosting/server-settings/sftp-card/use-detach-ssh-key.ts b/client/hosting/server-settings/components/sftp-card/use-detach-ssh-key.ts
similarity index 100%
rename from client/hosting/server-settings/sftp-card/use-detach-ssh-key.ts
rename to client/hosting/server-settings/components/sftp-card/use-detach-ssh-key.ts
diff --git a/client/hosting/server-settings/support-card/index.js b/client/hosting/server-settings/components/support-card/index.js
similarity index 100%
rename from client/hosting/server-settings/support-card/index.js
rename to client/hosting/server-settings/components/support-card/index.js
diff --git a/client/hosting/server-settings/support-card/style.scss b/client/hosting/server-settings/components/support-card/style.scss
similarity index 100%
rename from client/hosting/server-settings/support-card/style.scss
rename to client/hosting/server-settings/components/support-card/style.scss
diff --git a/client/hosting/server-settings/web-server-settings-card/index.tsx b/client/hosting/server-settings/components/web-server-settings-card/index.tsx
similarity index 100%
rename from client/hosting/server-settings/web-server-settings-card/index.tsx
rename to client/hosting/server-settings/components/web-server-settings-card/index.tsx
diff --git a/client/hosting/server-settings/web-server-settings-card/style.scss b/client/hosting/server-settings/components/web-server-settings-card/style.scss
similarity index 100%
rename from client/hosting/server-settings/web-server-settings-card/style.scss
rename to client/hosting/server-settings/components/web-server-settings-card/style.scss
diff --git a/client/hosting/server-settings/main.js b/client/hosting/server-settings/main.js
index 5df504d9649b7..5f495ce20a7c8 100644
--- a/client/hosting/server-settings/main.js
+++ b/client/hosting/server-settings/main.js
@@ -42,13 +42,13 @@ import {
 	getSelectedSiteId,
 	getSelectedSiteSlug,
 } from 'calypso/state/ui/selectors';
-import CacheCard from './cache-card';
+import CacheCard from './components/cache-card';
+import { HostingUpsellNudge } from './components/hosting-upsell-nudge';
+import PhpMyAdminCard from './components/phpmyadmin-card';
+import RestorePlanSoftwareCard from './components/restore-plan-software-card';
+import SFTPCard from './components/sftp-card';
+import WebServerSettingsCard from './components/web-server-settings-card';
 import HostingActivateStatus from './hosting-activate-status';
-import { HostingUpsellNudge } from './hosting-upsell-nudge';
-import PhpMyAdminCard from './phpmyadmin-card';
-import RestorePlanSoftwareCard from './restore-plan-software-card';
-import SFTPCard from './sftp-card';
-import WebServerSettingsCard from './web-server-settings-card';
 import './style.scss';
 
 const HEADING_OFFSET = 30;
diff --git a/client/me/security-ssh-key/use-update-ssh-key-mutation.ts b/client/me/security-ssh-key/use-update-ssh-key-mutation.ts
index fd315ed729878..449dde29cd0a4 100644
--- a/client/me/security-ssh-key/use-update-ssh-key-mutation.ts
+++ b/client/me/security-ssh-key/use-update-ssh-key-mutation.ts
@@ -1,6 +1,6 @@
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query';
 import { useCallback } from 'react';
-import { USE_ATOMIC_SSH_KEYS_QUERY_KEY } from 'calypso/hosting/server-settings/sftp-card/use-atomic-ssh-keys';
+import { USE_ATOMIC_SSH_KEYS_QUERY_KEY } from 'calypso/hosting/server-settings/components/sftp-card/use-atomic-ssh-keys';
 import wp from 'calypso/lib/wp';
 import { SSH_KEY_QUERY_KEY } from './use-ssh-key-query';
 
diff --git a/client/sites-dashboard/components/wpcom-smp-commands.tsx b/client/sites-dashboard/components/wpcom-smp-commands.tsx
index a29419819c5ab..b9918b3b60c1a 100644
--- a/client/sites-dashboard/components/wpcom-smp-commands.tsx
+++ b/client/sites-dashboard/components/wpcom-smp-commands.tsx
@@ -9,7 +9,7 @@ import {
 	useSetEdgeCacheMutation,
 	purgeEdgeCache,
 } from 'calypso/data/hosting/use-cache';
-import { useOpenPhpMyAdmin } from 'calypso/hosting/server-settings/phpmyadmin-card';
+import { useOpenPhpMyAdmin } from 'calypso/hosting/server-settings/components/phpmyadmin-card';
 import { navigate } from 'calypso/lib/navigate';
 import wpcom from 'calypso/lib/wp';
 import { useDispatch } from 'calypso/state';