diff --git a/packages/pl-fe/src/features/server-info/index.tsx b/packages/pl-fe/src/features/server-info/index.tsx
index 4477f3d644..18414f10ce 100644
--- a/packages/pl-fe/src/features/server-info/index.tsx
+++ b/packages/pl-fe/src/features/server-info/index.tsx
@@ -5,7 +5,7 @@ import { Column, Divider, Stack, Text } from 'pl-fe/components/ui';
 import { useInstance } from 'pl-fe/hooks';
 
 import LinkFooter from '../ui/components/link-footer';
-import PromoPanel from '../ui/components/promo-panel';
+import PromoPanel from '../ui/components/panels/promo-panel';
 
 const messages = defineMessages({
   heading: { id: 'column.info', defaultMessage: 'Server information' },
diff --git a/packages/pl-fe/src/features/ui/components/group-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
similarity index 97%
rename from packages/pl-fe/src/features/ui/components/group-media-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
index 6b8966a3c6..d273dd0b40 100644
--- a/packages/pl-fe/src/features/ui/components/group-media-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
@@ -8,7 +8,7 @@ import { Spinner, Text, Widget } from 'pl-fe/components/ui';
 import { useAppDispatch, useAppSelector } from 'pl-fe/hooks';
 import { type AccountGalleryAttachment, getGroupGallery } from 'pl-fe/selectors';
 
-import MediaItem from '../../account-gallery/components/media-item';
+import MediaItem from '../../../account-gallery/components/media-item';
 
 import type { Group } from 'pl-fe/normalizers';
 
diff --git a/packages/pl-fe/src/features/ui/components/instance-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/instance-info-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/instance-moderation-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/instance-moderation-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/pinned-accounts-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/pinned-accounts-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/profile-fields-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx
similarity index 93%
rename from packages/pl-fe/src/features/ui/components/profile-fields-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx
index 51a5394e1c..d7948f87c0 100644
--- a/packages/pl-fe/src/features/ui/components/profile-fields-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx
@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { Widget, Stack } from 'pl-fe/components/ui';
 
-import ProfileField from './profile-field';
+import ProfileField from '../profile-field';
 
 import type { Account } from 'pl-fe/normalizers';
 
diff --git a/packages/pl-fe/src/features/ui/components/profile-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
similarity index 98%
rename from packages/pl-fe/src/features/ui/components/profile-info-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
index 0d8e33648e..5cf966cd92 100644
--- a/packages/pl-fe/src/features/ui/components/profile-info-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
@@ -12,9 +12,9 @@ import { Icon, HStack, Stack, Text } from 'pl-fe/components/ui';
 import { useAppSelector, usePlFeConfig } from 'pl-fe/hooks';
 import { capitalize } from 'pl-fe/utils/strings';
 
-import ProfileFamiliarFollowers from './profile-familiar-followers';
-import ProfileField from './profile-field';
-import ProfileStats from './profile-stats';
+import ProfileFamiliarFollowers from '../profile-familiar-followers';
+import ProfileField from '../profile-field';
+import ProfileStats from '../profile-stats';
 
 import type { Scrobble as ScrobbleEntity } from 'pl-api';
 import type { Account } from 'pl-fe/normalizers';
diff --git a/packages/pl-fe/src/features/ui/components/profile-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
similarity index 97%
rename from packages/pl-fe/src/features/ui/components/profile-media-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
index 2fcd449fcd..7e2934838b 100644
--- a/packages/pl-fe/src/features/ui/components/profile-media-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
@@ -8,7 +8,7 @@ import { Spinner, Text, Widget } from 'pl-fe/components/ui';
 import { useAppDispatch, useAppSelector } from 'pl-fe/hooks';
 import { type AccountGalleryAttachment, getAccountGallery } from 'pl-fe/selectors';
 
-import MediaItem from '../../account-gallery/components/media-item';
+import MediaItem from '../../../account-gallery/components/media-item';
 
 import type { Account } from 'pl-fe/normalizers';
 
diff --git a/packages/pl-fe/src/features/ui/components/promo-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/promo-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/trends-panel.test.tsx b/packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/trends-panel.test.tsx
rename to packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx
diff --git a/packages/pl-fe/src/features/ui/components/trends-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/trends-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/user-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/user-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/user-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/components/who-to-follow-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx
similarity index 100%
rename from packages/pl-fe/src/features/ui/components/who-to-follow-panel.tsx
rename to packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx
diff --git a/packages/pl-fe/src/features/ui/util/async-components.ts b/packages/pl-fe/src/features/ui/util/async-components.ts
index ca895043b3..8e45f3f8f5 100644
--- a/packages/pl-fe/src/features/ui/util/async-components.ts
+++ b/packages/pl-fe/src/features/ui/util/async-components.ts
@@ -53,16 +53,16 @@ export const ServerInfo = lazy(() => import('pl-fe/features/server-info'));
 export const Dashboard = lazy(() => import('pl-fe/features/admin'));
 export const ModerationLog = lazy(() => import('pl-fe/features/admin/moderation-log'));
 export const ThemeEditor = lazy(() => import('pl-fe/features/theme-editor'));
-export const UserPanel = lazy(() => import('pl-fe/features/ui/components/user-panel'));
-export const PromoPanel = lazy(() => import('pl-fe/features/ui/components/promo-panel'));
+export const UserPanel = lazy(() => import('pl-fe/features/ui/components/panels/user-panel'));
+export const PromoPanel = lazy(() => import('pl-fe/features/ui/components/panels/promo-panel'));
 export const SignUpPanel = lazy(() => import('pl-fe/features/ui/components/panels/sign-up-panel'));
-export const TrendsPanel = lazy(() => import('pl-fe/features/ui/components/trends-panel'));
-export const ProfileInfoPanel = lazy(() => import('pl-fe/features/ui/components/profile-info-panel'));
-export const ProfileMediaPanel = lazy(() => import('pl-fe/features/ui/components/profile-media-panel'));
-export const ProfileFieldsPanel = lazy(() => import('pl-fe/features/ui/components/profile-fields-panel'));
-export const PinnedAccountsPanel = lazy(() => import('pl-fe/features/ui/components/pinned-accounts-panel'));
-export const InstanceInfoPanel = lazy(() => import('pl-fe/features/ui/components/instance-info-panel'));
-export const InstanceModerationPanel = lazy(() => import('pl-fe/features/ui/components/instance-moderation-panel'));
+export const TrendsPanel = lazy(() => import('pl-fe/features/ui/components/panels/trends-panel'));
+export const ProfileInfoPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-info-panel'));
+export const ProfileMediaPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-media-panel'));
+export const ProfileFieldsPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-fields-panel'));
+export const PinnedAccountsPanel = lazy(() => import('pl-fe/features/ui/components/panels/pinned-accounts-panel'));
+export const InstanceInfoPanel = lazy(() => import('pl-fe/features/ui/components/panels/instance-info-panel'));
+export const InstanceModerationPanel = lazy(() => import('pl-fe/features/ui/components/panels/instance-moderation-panel'));
 export const LatestAccountsPanel = lazy(() => import('pl-fe/features/admin/components/latest-accounts-panel'));
 export const SidebarMenu = lazy(() => import('pl-fe/components/sidebar-menu'));
 export const ModalRoot = lazy(() => import('pl-fe/features/ui/components/modal-root'));
@@ -77,7 +77,7 @@ export const UserIndex = lazy(() => import('pl-fe/features/admin/user-index'));
 export const FederationRestrictions = lazy(() => import('pl-fe/features/federation-restrictions'));
 export const Aliases = lazy(() => import('pl-fe/features/aliases'));
 export const Migration = lazy(() => import('pl-fe/features/migration'));
-export const WhoToFollowPanel = lazy(() => import('pl-fe/features/ui/components/who-to-follow-panel'));
+export const WhoToFollowPanel = lazy(() => import('pl-fe/features/ui/components/panels/who-to-follow-panel'));
 export const FollowRecommendations = lazy(() => import('pl-fe/features/follow-recommendations'));
 export const Directory = lazy(() => import('pl-fe/features/directory'));
 export const RegisterInvite = lazy(() => import('pl-fe/features/register-invite'));
@@ -108,7 +108,7 @@ export const GroupMembershipRequests = lazy(() => import('pl-fe/features/group/g
 export const GroupGallery = lazy(() => import('pl-fe/features/group/group-gallery'));
 export const NewGroupPanel = lazy(() => import('pl-fe/features/ui/components/panels/new-group-panel'));
 export const MyGroupsPanel = lazy(() => import('pl-fe/features/ui/components/panels/my-groups-panel'));
-export const GroupMediaPanel = lazy(() => import('pl-fe/features/ui/components/group-media-panel'));
+export const GroupMediaPanel = lazy(() => import('pl-fe/features/ui/components/panels/group-media-panel'));
 export const NewEventPanel = lazy(() => import('pl-fe/features/ui/components/panels/new-event-panel'));
 export const Announcements = lazy(() => import('pl-fe/features/admin/announcements'));
 export const FollowedTags = lazy(() => import('pl-fe/features/followed-tags'));