keybase · chrisnojima · Jan 12, 2026 · Jan 12, 2026 · Jan 12, 2026 · Jan 12, 2026
diff --git a/shared/app/global-errors/hook.tsx b/shared/app/global-errors/hook.tsx
@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as React from 'react'
 import {useConfigState} from '@/stores/config'
 import type {RPCError} from '@/util/errors'
-import {settingsFeedbackTab} from '@/constants/settings/util'
+import {settingsFeedbackTab} from '@/constants/settings'
 import {useDaemonState} from '@/stores/daemon'
 
 export type Size = 'Closed' | 'Small' | 'Big'

diff --git a/shared/common-adapters/reload.tsx b/shared/common-adapters/reload.tsx
@@ -9,7 +9,7 @@ import Text from './text'
 import Button from './button'
 import Icon from './icon'
 import type {RPCError} from '@/util/errors'
-import {settingsFeedbackTab} from '@/constants/settings/util'
+import {settingsFeedbackTab} from '@/constants/settings'
 import {useConfigState} from '@/stores/config'
 
 const Kb = {

diff --git a/shared/constants/chat2/convostate.tsx b/shared/constants/chat2/convostate.tsx
@@ -1,6 +1,6 @@
 // TODO remove useChatNavigateAppend
 // TODO remove
-import * as TeamsUtil from '../teams/util'
+import * as TeamsUtil from '../teams'
 import * as PlatformSpecific from '../platform-specific'
 import {
   clearModals,
@@ -11,7 +11,7 @@ import {
   getVisibleScreen,
   getModalStack,
   navToThread,
-} from '../router2/util'
+} from '../router2'
 import {isIOS} from '../platform'
 import {updateImmer} from '../utils'
 import * as T from '../types'
@@ -23,7 +23,7 @@ import * as Message from './message'
 import * as Meta from './meta'
 import * as React from 'react'
 import * as Z from '@/util/zustand'
-import {makeActionForOpenPathInFilesTab} from '@/constants/fs/util'
+import {makeActionForOpenPathInFilesTab} from '@/constants/fs'
 import HiddenString from '@/util/hidden-string'
 import isEqual from 'lodash/isEqual'
 import logger from '@/logger'
@@ -41,12 +41,12 @@ import {hexToUint8Array} from 'uint8array-extras'
 import assign from 'lodash/assign'
 import {clearChatTimeCache} from '@/util/timestamp'
 import {registerDebugClear} from '@/util/debug'
-import * as Config from '@/constants/config/util'
+import * as Config from '@/constants/config'
 import {isMobile} from '@/constants/platform'
 import {enumKeys, ignorePromise, shallowEqual} from '../utils'
 import * as Strings from '@/constants/strings'
 
-import {storeRegistry} from '../store-registry'
+import {storeRegistry} from '@/stores/store-registry'
 import {useConfigState} from '@/stores/config'
 import {useCurrentUserState} from '@/stores/current-user'
 

diff --git a/shared/constants/chat2/util.tsx → shared/constants/chat2/index.tsx b/shared/constants/chat2/util.tsx → shared/constants/chat2/index.tsx
diff --git a/shared/constants/chat2/message.tsx b/shared/constants/chat2/message.tsx
@@ -1,14 +1,14 @@
 // Message related constants
 import * as T from '../types'
-import * as TeamsUtil from '../teams/util'
+import * as TeamsUtil from '@/constants/teams'
 import type * as ConvoConstants from './convostate'
 import HiddenString from '@/util/hidden-string'
 import logger from '@/logger'
-import type * as MessageTypes from '../types/chat2/message'
+import type * as MessageTypes from '@/constants/types/chat2/message'
 import type {ServiceId} from 'util/platforms'
-import {noConversationIDKey} from '../types/chat2/common'
+import {noConversationIDKey} from '@/constants/types/chat2/common'
 import invert from 'lodash/invert'
-import {isIOS, isMobile} from '../platform'
+import {isIOS, isMobile} from '@/constants/platform'
 
 const noString = new HiddenString('')
 

diff --git a/shared/constants/chat2/meta.tsx b/shared/constants/chat2/meta.tsx
@@ -1,10 +1,10 @@
 // Meta manages the metadata about a conversation. Participants, isMuted, reset people, etc. Things that drive the inbox
 import {shallowEqual} from '../utils'
-import * as T from '../types'
-import * as Teams from '../teams/util'
+import * as T from '@/constants/types'
+import * as Teams from '@/constants/teams'
 import * as Message from './message'
 import {base64ToUint8Array, uint8ArrayToHex} from 'uint8array-extras'
-import {storeRegistry} from '../store-registry'
+import {storeRegistry} from '@/stores/store-registry'
 import {useCurrentUserState} from '@/stores/current-user'
 
 const conversationMemberStatusToMembershipType = (m: T.RPCChat.ConversationMemberStatus) => {

diff --git a/shared/constants/config/util.tsx → shared/constants/config.tsx b/shared/constants/config/util.tsx → shared/constants/config.tsx
@@ -1,5 +1,5 @@
 import uniq from 'lodash/uniq'
-import {runMode} from '../platform'
+import {runMode} from './platform'
 // An ugly error message from the service that we'd like to rewrite ourselves.
 export const invalidPasswordErrorString = 'Bad password: Invalid password. Server rejected login attempt..'
 

diff --git a/shared/constants/crypto/util.tsx → shared/constants/crypto.tsx b/shared/constants/crypto/util.tsx → shared/constants/crypto.tsx
@@ -1,4 +1,4 @@
-import {isMobile} from '../platform'
+import {isMobile} from './platform'
 
 export const saltpackDocumentation = 'https://saltpack.org'
 export const inputDesktopMaxHeight = {maxHeight: '30%'} as const

diff --git a/shared/constants/deeplinks/index.tsx → shared/constants/deeplinks.tsx b/shared/constants/deeplinks/index.tsx → shared/constants/deeplinks.tsx
@@ -1,12 +1,12 @@
-import * as Crypto from '../crypto/util'
-import * as Tabs from '../tabs'
+import * as Crypto from './crypto'
+import * as Tabs from './tabs'
 import {isPathSaltpackEncrypted, isPathSaltpackSigned} from '@/util/path'
 import type HiddenString from '@/util/hidden-string'
 import URL from 'url-parse'
 import logger from '@/logger'
 import * as T from '@/constants/types'
-import {navigateAppend, switchTab} from '../router2/util'
-import {storeRegistry} from '../store-registry'
+import {navigateAppend, switchTab} from './router2'
+import {storeRegistry} from '@/stores/store-registry'
 import {useCryptoState} from '@/stores/crypto'
 import {useConfigState} from '@/stores/config'
 

diff --git a/shared/constants/fs/util.tsx → shared/constants/fs/index.tsx b/shared/constants/fs/util.tsx → shared/constants/fs/index.tsx
@@ -2,8 +2,8 @@ import type * as React from 'react'
 import * as Tabs from '../tabs'
 import * as T from '../types'
 import {isLinux, isMobile} from '../platform'
-import {settingsFsTab} from '../settings/util'
-import {navigateAppend} from '../router2/util'
+import {settingsFsTab} from '../settings'
+import {navigateAppend} from '../router2'
 export const makeActionForOpenPathInFilesTab = (
   // TODO: remove the second arg when we are done with migrating to nav2
   path: T.FS.Path

diff --git a/shared/constants/fs/platform-specific.desktop.tsx b/shared/constants/fs/platform-specific.desktop.tsx
@@ -7,7 +7,7 @@ import logger from '@/logger'
 import * as Path from '@/util/path'
 import KB2 from '@/util/electron.desktop'
 import {uint8ArrayToHex} from 'uint8array-extras'
-import {navigateAppend} from '../router2/util'
+import {navigateAppend} from '../router2'
 import {useConfigState} from '@/stores/config'
 
 const useFSState = Constants.useFSState

diff --git a/shared/constants/init/index.desktop.tsx b/shared/constants/init/index.desktop.tsx
@@ -18,7 +18,7 @@ import {isLinux, isWindows} from '@/constants/platform.desktop'
 import {kbfsNotification} from '@/constants/platform-specific/kbfs-notifications'
 import {skipAppFocusActions} from '@/local-debug.desktop'
 import NotifyPopup from '@/util/notify-popup'
-import {noKBFSFailReason} from '@/constants/config/util'
+import {noKBFSFailReason} from '@/constants/config'
 import {initSharedSubscriptions, _onEngineIncoming} from './shared'
 import {wrapErrors} from '@/util/debug'
 

diff --git a/shared/constants/init/shared.tsx b/shared/constants/init/shared.tsx
@@ -24,7 +24,7 @@ import type * as UseNotificationsStateType from '@/stores/notifications'
 import type * as UsePeopleStateType from '@/stores/people'
 import type * as UsePinentryStateType from '@/stores/pinentry'
 import {useProvisionState} from '@/stores/provision'
-import {storeRegistry} from '../store-registry'
+import {storeRegistry} from '@/stores/store-registry'
 import {useSettingsContactsState} from '@/stores/settings-contacts'
 import type * as UseSignupStateType from '@/stores/signup'
 import type * as UseTeamsStateType from '@/stores/teams'

diff --git a/shared/constants/notifications/util.tsx → shared/constants/notifications.tsx b/shared/constants/notifications/util.tsx → shared/constants/notifications.tsx
diff --git a/shared/constants/people/util.tsx → shared/constants/people.tsx b/shared/constants/people/util.tsx → shared/constants/people.tsx
diff --git a/shared/constants/platform-specific/push.native.tsx b/shared/constants/platform-specific/push.native.tsx
@@ -9,7 +9,7 @@ import {
   getInitialNotification,
   removeAllPendingNotificationRequests,
 } from 'react-native-kb'
-import {storeRegistry} from '../store-registry'
+import {storeRegistry} from '@/stores/store-registry'
 import {useConfigState} from '@/stores/config'
 import {useLogoutState} from '@/stores/logout'
 

diff --git a/shared/constants/push.native.tsx b/shared/constants/push.native.tsx
@@ -1,8 +1,8 @@
 import * as Tabs from '@/constants/tabs'
 import * as S from '@/constants/strings'
 import {ignorePromise, neverThrowPromiseFunc, timeoutPromise} from '@/constants/utils'
-import {navigateAppend, navUpToScreen, switchTab} from '@/constants/router2/util'
-import {storeRegistry} from '@/constants/store-registry'
+import {navigateAppend, navUpToScreen, switchTab} from '@/constants/router2'
+import {storeRegistry} from '@/stores/store-registry'
 import {useConfigState} from '@/stores/config'
 import {useCurrentUserState} from '@/stores/current-user'
 import {useLogoutState} from '@/stores/logout'

diff --git a/shared/constants/recover-password/utils.tsx → shared/constants/recover-password.tsx b/shared/constants/recover-password/utils.tsx → shared/constants/recover-password.tsx
diff --git a/shared/constants/router2/util.tsx → shared/constants/router2.tsx b/shared/constants/router2/util.tsx → shared/constants/router2.tsx
@@ -1,6 +1,6 @@
 import type * as React from 'react'
-import type * as T from '../types'
-import * as Tabs from '../tabs'
+import type * as T from './types'
+import * as Tabs from './tabs'
 import {
   StackActions,
   CommonActions,
@@ -10,11 +10,11 @@ import {
   type NavigationState,
 } from '@react-navigation/core'
 import type {NavigateAppendType, RouteKeys, RootParamList as KBRootParamList} from '@/router-v2/route-params'
-import type {GetOptionsRet} from '../types/router2'
+import type {GetOptionsRet} from './types/router2'
 import {produce} from 'immer'
 import isEqual from 'lodash/isEqual'
-import {isMobile, isTablet} from '../platform'
-import {shallowEqual, type ViewPropsToPageProps} from '../utils'
+import {isMobile, isTablet} from './platform'
+import {shallowEqual, type ViewPropsToPageProps} from './utils'
 import {registerDebugClear} from '@/util/debug'
 
 export const navigationRef = createNavigationContainerRef<KBRootParamList>()
@@ -440,4 +440,3 @@ export const appendEncryptRecipientsBuilder = () => {
     selected: 'cryptoTeamBuilder',
   })
 }
-
diff --git a/shared/constants/settings/util.tsx → shared/constants/settings.tsx b/shared/constants/settings/util.tsx → shared/constants/settings.tsx
diff --git a/shared/constants/team-building/utils.tsx → shared/constants/team-building.tsx b/shared/constants/team-building/utils.tsx → shared/constants/team-building.tsx
@@ -1,4 +1,4 @@
-import type * as T from '../types'
+import type * as T from './types'
 
 const searchServices: Array<T.TB.ServiceId> = ['keybase', 'twitter', 'github', 'reddit', 'hackernews']
 

diff --git a/shared/constants/teams/util.tsx → shared/constants/teams.tsx b/shared/constants/teams/util.tsx → shared/constants/teams.tsx
@@ -1,4 +1,4 @@
-import * as T from '../types'
+import * as T from './types'
 import invert from 'lodash/invert'
 
 export const makeRetentionPolicy = (

diff --git a/shared/constants/tracker2/util.tsx → shared/constants/tracker2.tsx b/shared/constants/tracker2/util.tsx → shared/constants/tracker2.tsx
diff --git a/shared/constants/unlock-folders/util.tsx → shared/constants/unlock-folders.tsx b/shared/constants/unlock-folders/util.tsx → shared/constants/unlock-folders.tsx
diff --git a/shared/constants/users/util.tsx → shared/constants/users.tsx b/shared/constants/users/util.tsx → shared/constants/users.tsx
diff --git a/shared/constants/wallets/utils.tsx → shared/constants/wallets.tsx b/shared/constants/wallets/utils.tsx → shared/constants/wallets.tsx
diff --git a/shared/constants/whats-new/utils.tsx → shared/constants/whats-new.tsx b/shared/constants/whats-new/utils.tsx → shared/constants/whats-new.tsx
diff --git a/shared/crypto/routes.tsx b/shared/crypto/routes.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as C from '@/constants'
-import * as Crypto from '@/constants/crypto/util'
+import * as Crypto from '@/constants/crypto'
 import {HeaderLeftCancel2, type HeaderBackButtonProps} from '@/common-adapters/header-hoc'
 import cryptoTeamBuilder from '../team-building/page'
 

diff --git a/shared/desktop/renderer/main2.desktop.tsx b/shared/desktop/renderer/main2.desktop.tsx
@@ -16,8 +16,8 @@ import {useConfigState} from '@/stores/config'
 import {usePinentryState} from '@/stores/pinentry'
 import * as T from '@/constants/types'
 import {RPCError} from '@/util/errors'
-import {switchTab} from '@/constants/router2/util'
-import {storeRegistry} from '@/constants/store-registry'
+import {switchTab} from '@/constants/router2'
+import {storeRegistry} from '@/stores/store-registry'
 import {onEngineConnected, onEngineDisconnected} from '@/constants/init/index.desktop'
 import {handleAppLink, handleSaltPackOpen} from '@/constants/deeplinks'
 import logger from '@/logger'

diff --git a/shared/login/routes.tsx b/shared/login/routes.tsx
@@ -5,7 +5,7 @@ import {InfoIcon} from '@/signup/common'
 import {newRoutes as provisionRoutes} from '../provision/routes-sub'
 import {sharedNewRoutes as settingsRoutes} from '../settings/routes'
 import {newRoutes as signupRoutes} from './signup/routes'
-import {settingsFeedbackTab} from '@/constants/settings/util'
+import {settingsFeedbackTab} from '@/constants/settings'
 
 const recoverPasswordStyles = Kb.Styles.styleSheetCreate(() => ({
   questionBox: Kb.Styles.padding(Kb.Styles.globalMargins.tiny, Kb.Styles.globalMargins.tiny, 0),

diff --git a/shared/people/announcement.tsx b/shared/people/announcement.tsx
@@ -4,7 +4,7 @@ import * as T from '@/constants/types'
 import openURL from '@/util/open-url'
 import * as Kb from '@/common-adapters'
 import PeopleItem from './item'
-import * as Settings from '@/constants/settings/util'
+import * as Settings from '@/constants/settings'
 import {usePeopleState} from '@/stores/people'
 
 type OwnProps = {

diff --git a/shared/people/todo.tsx b/shared/people/todo.tsx
@@ -8,7 +8,7 @@ import PeopleItem, {type TaskButton} from './item'
 import * as Kb from '@/common-adapters'
 import {useSettingsPhoneState} from '@/stores/settings-phone'
 import {useSettingsEmailState} from '@/stores/settings-email'
-import {settingsAccountTab, settingsGitTab} from '@/constants/settings/util'
+import {settingsAccountTab, settingsGitTab} from '@/constants/settings'
 import {useTrackerState} from '@/stores/tracker2'
 import {useProfileState} from '@/stores/profile'
 import {usePeopleState, todoTypes} from '@/stores/people'

diff --git a/shared/router-v2/account-switcher/index.tsx b/shared/router-v2/account-switcher/index.tsx
@@ -4,7 +4,7 @@ import {useConfigState} from '@/stores/config'
 import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type * as T from '@/constants/types'
-import {settingsLogOutTab} from '@/constants/settings/util'
+import {settingsLogOutTab} from '@/constants/settings'
 import {useTrackerState} from '@/stores/tracker2'
 import {useProfileState} from '@/stores/profile'
 import {useUsersState} from '@/stores/users'

diff --git a/shared/router-v2/tab-bar.desktop.tsx b/shared/router-v2/tab-bar.desktop.tsx
@@ -13,7 +13,7 @@ import openURL from '@/util/open-url'
 import {isLinux} from '@/constants/platform'
 import KB2 from '@/util/electron.desktop'
 import './tab-bar.css'
-import {settingsLogOutTab} from '@/constants/settings/util'
+import {settingsLogOutTab} from '@/constants/settings'
 import {useTrackerState} from '@/stores/tracker2'
 import {useFSState} from '@/stores/fs'
 import {useProfileState} from '@/stores/profile'

diff --git a/shared/settings/routes.tsx b/shared/settings/routes.tsx
@@ -3,7 +3,7 @@ import * as C from '@/constants'
 import {newRoutes as devicesRoutes} from '../devices/routes'
 import {newRoutes as gitRoutes} from '../git/routes'
 import {newRoutes as walletsRoutes} from '../wallets/routes'
-import * as Settings from '@/constants/settings/util'
+import * as Settings from '@/constants/settings'
 
 const SettingsRootDesktop = React.lazy(async () => import('./root-desktop-tablet'))
 

diff --git a/shared/stores/archive.tsx b/shared/stores/archive.tsx
@@ -1,11 +1,11 @@
-import * as T from '../constants/types'
+import * as T from '@/constants/types'
 import * as Z from '@/util/zustand'
-import {ignorePromise} from '../constants/utils'
+import {ignorePromise} from '@/constants/utils'
 import * as EngineGen from '@/actions/engine-gen-gen'
-import {pathToRPCPath} from '@/constants/fs/util'
+import {pathToRPCPath} from '@/constants/fs'
 import {formatTimeForPopup} from '@/util/timestamp'
 import {uint8ArrayToHex} from 'uint8array-extras'
-import {isMobile} from '../constants/platform'
+import {isMobile} from '@/constants/platform'
 
 type ChatJob = {
   id: string

diff --git a/shared/stores/autoreset.tsx b/shared/stores/autoreset.tsx
@@ -5,8 +5,8 @@ import * as T from '@/constants/types'
 import * as EngineGen from '@/actions/engine-gen-gen'
 import logger from '@/logger'
 import {RPCError} from '@/util/errors'
-import {navigateAppend, navUpToScreen} from '@/constants/router2/util'
-import {storeRegistry} from '@/constants/store-registry'
+import {navigateAppend, navUpToScreen} from '@/constants/router2'
+import {storeRegistry} from '@/stores/store-registry'
 
 type Store = T.Immutable<{
   active: boolean

diff --git a/shared/stores/chat2.tsx b/shared/stores/chat2.tsx
@@ -5,7 +5,7 @@ import * as EngineGen from '@/actions/engine-gen-gen'
 import type * as ConfigConstants from '@/stores/config'
 import * as Message from '@/constants/chat2/message'
 import * as Router2 from '@/stores/router2'
-import * as TeamConstants from '@/constants/teams/util'
+import * as TeamConstants from '@/constants/teams'
 import logger from '@/logger'
 import {RPCError} from '@/util/errors'
 import * as Meta from '@/constants/chat2/meta'
@@ -16,8 +16,8 @@ import {clearChatStores, chatStores} from '@/constants/chat2/convostate'
 import {uint8ArrayToString} from 'uint8array-extras'
 import isEqual from 'lodash/isEqual'
 import {bodyToJSON} from '@/constants/rpc-utils'
-import {navigateAppend, navUpToScreen, switchTab} from '@/constants/router2/util'
-import {storeRegistry} from '@/constants/store-registry'
+import {navigateAppend, navUpToScreen, switchTab} from '@/constants/router2'
+import {storeRegistry} from '@/stores/store-registry'
 import {useConfigState} from '@/stores/config'
 import {useCurrentUserState} from '@/stores/current-user'
 import {useWaitingState} from '@/stores/waiting'

diff --git a/shared/stores/config.tsx b/shared/stores/config.tsx
@@ -11,8 +11,8 @@ import type {Tab} from '@/constants/tabs'
 import {RPCError, convertToError, isEOFError, isErrorTransient, niceError} from '@/util/errors'
 import {defaultUseNativeFrame, isMobile} from '@/constants/platform'
 import {type CommonResponseHandler} from '@/engine/types'
-import {invalidPasswordErrorString} from '@/constants/config/util'
-import {navigateAppend} from '@/constants/router2/util'
+import {invalidPasswordErrorString} from '@/constants/config'
+import {navigateAppend} from '@/constants/router2'
 
 type Store = T.Immutable<{
   active: boolean

diff --git a/shared/stores/crypto.tsx b/shared/stores/crypto.tsx
@@ -6,10 +6,10 @@ import HiddenString from '@/util/hidden-string'
 import logger from '@/logger'
 import * as T from '@/constants/types'
 import {RPCError} from '@/util/errors'
-import {navigateAppend} from '@/constants/router2/util'
+import {navigateAppend} from '@/constants/router2'
 import {useCurrentUserState} from '@/stores/current-user'
-import {Operations} from '@/constants/crypto/util'
-export * from '@/constants/crypto/util'
+import {Operations} from '@/constants/crypto'
+export * from '@/constants/crypto'
 
 type CommonStore = {
   bytesComplete: number

diff --git a/shared/stores/fs.tsx b/shared/stores/fs.tsx
@@ -11,13 +11,13 @@ import logger from '@/logger'
 import {tlfToPreferredOrder} from '@/util/kbfs'
 import isObject from 'lodash/isObject'
 import isEqual from 'lodash/isEqual'
-import {navigateAppend, navigateUp} from '@/constants/router2/util'
-import {storeRegistry} from '@/constants/store-registry'
+import {navigateAppend, navigateUp} from '@/constants/router2'
+import {storeRegistry} from '@/stores/store-registry'
 import {useConfigState} from '@/stores/config'
 import {useCurrentUserState} from '@/stores/current-user'
-import * as Util from '@/constants/fs/util'
+import * as Util from '@/constants/fs'
 
-export * from '@/constants/fs/util'
+export * from '@/constants/fs'
 
 const subscriptionDeduplicateIntervalSecond = 1
 

diff --git a/shared/stores/git.tsx b/shared/stores/git.tsx
@@ -5,7 +5,7 @@ import * as EngineGen from '@/actions/engine-gen-gen'
 import * as dateFns from 'date-fns'
 import * as Z from '@/util/zustand'
 import debounce from 'lodash/debounce'
-import {navigateAppend} from '@/constants/router2/util'
+import {navigateAppend} from '@/constants/router2'
 import {useConfigState} from '@/stores/config'
 
 const parseRepos = (results: ReadonlyArray<T.RPCGen.GitRepoResult>) => {