diff --git a/native/bottom-sheets/bottom-sheet-backdrop.react.js b/native/bottom-sheet/bottom-sheet-backdrop.react.js
rename from native/bottom-sheets/bottom-sheet-backdrop.react.js
rename to native/bottom-sheet/bottom-sheet-backdrop.react.js
diff --git a/native/bottom-sheets/bottom-sheet-handle.react.js b/native/bottom-sheet/bottom-sheet-handle.react.js
rename from native/bottom-sheets/bottom-sheet-handle.react.js
rename to native/bottom-sheet/bottom-sheet-handle.react.js
diff --git a/native/bottom-sheets/bottom-sheet.react.js b/native/bottom-sheet/bottom-sheet.react.js
rename from native/bottom-sheets/bottom-sheet.react.js
rename to native/bottom-sheet/bottom-sheet.react.js
diff --git a/native/navigation/root-navigator.react.js b/native/navigation/root-navigator.react.js
--- a/native/navigation/root-navigator.react.js
+++ b/native/navigation/root-navigator.react.js
@@ -50,7 +50,6 @@
 import LoggedOutModal from '../account/logged-out-modal.react.js';
 import RegistrationNavigator from '../account/registration/registration-navigator.react.js';
 import TermsAndPrivacyModal from '../account/terms-and-privacy-modal.react.js';
-import UserProfileBottomSheet from '../bottom-sheets/user-profile-bottom-sheet.react.js';
 import ThreadPickerModal from '../calendar/thread-picker-modal.react.js';
 import ImagePasteModal from '../chat/image-paste-modal.react.js';
 import MessageReactionsModal from '../chat/message-reactions-modal.react.js';
@@ -64,6 +63,7 @@
 import CustomServerModal from '../profile/custom-server-modal.react.js';
 import QRCodeSignInNavigator from '../qr-code/qr-code-sign-in-navigator.react.js';
 import RolesNavigator from '../roles/roles-navigator.react.js';
+import UserProfileBottomSheet from '../user-profile/user-profile-bottom-sheet.react.js';
 
 enableScreens();
 
diff --git a/native/navigation/route-names.js b/native/navigation/route-names.js
--- a/native/navigation/route-names.js
+++ b/native/navigation/route-names.js
@@ -13,7 +13,6 @@
 import type { RegistrationTermsParams } from '../account/registration/registration-terms.react.js';
 import type { UsernameSelectionParams } from '../account/registration/username-selection.react.js';
 import type { TermsAndPrivacyModalParams } from '../account/terms-and-privacy-modal.react.js';
-import type { UserProfileBottomSheetParams } from '../bottom-sheets/user-profile-bottom-sheet.react.js';
 import type { ThreadPickerModalParams } from '../calendar/thread-picker-modal.react.js';
 import type { ComposeSubchannelParams } from '../chat/compose-subchannel.react.js';
 import type { FullScreenThreadMediaGalleryParams } from '../chat/fullscreen-thread-media-gallery.react.js';
@@ -47,6 +46,7 @@
 import type { CommunityRolesScreenParams } from '../roles/community-roles-screen.react.js';
 import type { CreateRolesScreenParams } from '../roles/create-roles-screen.react.js';
 import type { MessageSearchParams } from '../search/message-search.react.js';
+import type { UserProfileBottomSheetParams } from '../user-profile/user-profile-bottom-sheet.react.js';
 
 export const ActionResultModalRouteName = 'ActionResultModal';
 export const AddUsersModalRouteName = 'AddUsersModal';
diff --git a/native/bottom-sheets/user-profile-bottom-sheet.react.js b/native/user-profile/user-profile-bottom-sheet.react.js
rename from native/bottom-sheets/user-profile-bottom-sheet.react.js
rename to native/user-profile/user-profile-bottom-sheet.react.js
--- a/native/bottom-sheets/user-profile-bottom-sheet.react.js
+++ b/native/user-profile/user-profile-bottom-sheet.react.js
@@ -4,8 +4,8 @@
 
 import type { UserInfo } from 'lib/types/user-types';
 
-import BottomSheet from './bottom-sheet.react.js';
-import UserProfile from '../components/user-profile.react.js';
+import UserProfile from './user-profile.react.js';
+import BottomSheet from '../bottom-sheet/bottom-sheet.react.js';
 import type { RootNavigationProp } from '../navigation/root-navigator.react.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
 import { useSelector } from '../redux/redux-utils.js';
diff --git a/native/components/user-profile-message-button.react.js b/native/user-profile/user-profile-message-button.react.js
rename from native/components/user-profile-message-button.react.js
rename to native/user-profile/user-profile-message-button.react.js
--- a/native/components/user-profile-message-button.react.js
+++ b/native/user-profile/user-profile-message-button.react.js
@@ -7,9 +7,9 @@
 import type { ThreadInfo } from 'lib/types/thread-types.js';
 import type { UserInfo } from 'lib/types/user-types';
 
-import Button from './button.react.js';
-import SWMansionIcon from './swmansion-icon.react.js';
 import { useNavigateToThread } from '../chat/message-list-types.js';
+import Button from '../components/button.react.js';
+import SWMansionIcon from '../components/swmansion-icon.react.js';
 import { useStyles } from '../themes/colors.js';
 
 type Props = {
diff --git a/native/components/user-profile-relationship-button.react.js b/native/user-profile/user-profile-relationship-button.react.js
rename from native/components/user-profile-relationship-button.react.js
rename to native/user-profile/user-profile-relationship-button.react.js
--- a/native/components/user-profile-relationship-button.react.js
+++ b/native/user-profile/user-profile-relationship-button.react.js
@@ -8,7 +8,7 @@
 import type { ThreadInfo } from 'lib/types/thread-types.js';
 import type { UserInfo } from 'lib/types/user-types';
 
-import RelationshipButton from './relationship-button.react.js';
+import RelationshipButton from '../components/relationship-button.react.js';
 import { useStyles } from '../themes/colors.js';
 import Alert from '../utils/alert.js';
 
diff --git a/native/components/user-profile.react.js b/native/user-profile/user-profile.react.js
rename from native/components/user-profile.react.js
rename to native/user-profile/user-profile.react.js
--- a/native/components/user-profile.react.js
+++ b/native/user-profile/user-profile.react.js
@@ -10,11 +10,11 @@
 import type { UserInfo } from 'lib/types/user-types';
 import sleep from 'lib/utils/sleep.js';
 
-import SWMansionIcon from './swmansion-icon.react.js';
 import UserProfileMessageButton from './user-profile-message-button.react.js';
 import UserProfileRelationshipButton from './user-profile-relationship-button.react.js';
 import UserAvatar from '../avatars/user-avatar.react.js';
 import SingleLine from '../components/single-line.react.js';
+import SWMansionIcon from '../components/swmansion-icon.react.js';
 import { useStyles } from '../themes/colors.js';
 
 type Props = {