diff --git a/conference.js b/conference.js
index 6c777c007d..7c33507852 100644
--- a/conference.js
+++ b/conference.js
@@ -17,9 +17,9 @@ import {
     createDeviceChangedEvent,
     createScreenSharingEvent,
     createStartSilentEvent,
-    createTrackMutedEvent,
-    sendAnalytics
-} from './react/features/analytics';
+    createTrackMutedEvent
+} from './react/features/analytics/AnalyticsEvents';
+import { sendAnalytics } from './react/features/analytics/functions';
 import {
     maybeRedirectToWelcomePage,
     redirectToStaticPage,
@@ -86,22 +86,21 @@ import {
 } from './react/features/base/lib-jitsi-meet';
 import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
 import {
-    MEDIA_TYPE,
-    getStartWithAudioMuted,
-    getStartWithVideoMuted,
-    isVideoMutedByUser,
     setAudioAvailable,
     setAudioMuted,
     setAudioUnmutePermissions,
     setVideoAvailable,
     setVideoMuted,
     setVideoUnmutePermissions
-} from './react/features/base/media';
+} from './react/features/base/media/actions';
+import { MEDIA_TYPE } from './react/features/base/media/constants';
+import {
+    getStartWithAudioMuted,
+    getStartWithVideoMuted,
+    isVideoMutedByUser
+} from './react/features/base/media/functions';
 import {
     dominantSpeakerChanged,
-    getLocalParticipant,
-    getNormalizedDisplayName,
-    getVirtualScreenshareParticipantByOwnerId,
     localParticipantAudioLevelChanged,
     localParticipantRoleChanged,
     participantKicked,
@@ -112,23 +111,30 @@ import {
     participantUpdated,
     screenshareParticipantDisplayNameChanged,
     updateRemoteParticipantFeatures
-} from './react/features/base/participants';
-import { updateSettings } from './react/features/base/settings';
+} from './react/features/base/participants/actions';
+import {
+    getLocalParticipant,
+    getNormalizedDisplayName,
+    getVirtualScreenshareParticipantByOwnerId
+} from './react/features/base/participants/functions';
+import { updateSettings } from './react/features/base/settings/actions';
 import {
     addLocalTrack,
-    createLocalTracksF,
     destroyLocalTracks,
+    replaceLocalTrack,
+    toggleScreensharing as toggleScreensharingA,
+    trackAdded,
+    trackRemoved
+} from './react/features/base/tracks/actions';
+import {
+    createLocalTracksF,
     getLocalJitsiAudioTrack,
     getLocalJitsiVideoTrack,
     getLocalTracks,
     getLocalVideoTrack,
     isLocalTrackMuted,
-    isUserInteractionRequiredForUnmute,
-    replaceLocalTrack,
-    toggleScreensharing as toggleScreensharingA,
-    trackAdded,
-    trackRemoved
-} from './react/features/base/tracks';
+    isUserInteractionRequiredForUnmute
+} from './react/features/base/tracks/functions';
 import { downloadJSON } from './react/features/base/util/downloadJSON';
 import { showDesktopPicker } from './react/features/desktop-picker/actions';
 import { appendSuffix } from './react/features/display-name/functions';
@@ -145,7 +151,7 @@ import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay
 import { suspendDetected } from './react/features/power-monitor/actions';
 import { initPrejoin, makePrecallTest, setJoiningInProgress } from './react/features/prejoin/actions';
 import { isPrejoinPageVisible } from './react/features/prejoin/functions';
-import { disableReceiver, stopReceiver } from './react/features/remote-control';
+import { disableReceiver, stopReceiver } from './react/features/remote-control/actions';
 import { setScreenAudioShareState } from './react/features/screen-share/actions.web';
 import { isScreenAudioShared } from './react/features/screen-share/functions';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture/actions';
diff --git a/connection.js b/connection.js
index fc863ef865..3456a97da2 100644
--- a/connection.js
+++ b/connection.js
@@ -12,7 +12,7 @@ import {
     constructOptions
 } from './react/features/base/connection/actions.web';
 import { openDialog } from './react/features/base/dialog/actions';
-import { setJWT } from './react/features/base/jwt';
+import { setJWT } from './react/features/base/jwt/actions';
 import {
     JitsiConnectionErrors,
     JitsiConnectionEvents
diff --git a/modules/API/API.js b/modules/API/API.js
index c9ca5f8ca5..91778b95ac 100644
--- a/modules/API/API.js
+++ b/modules/API/API.js
@@ -2,10 +2,8 @@
 
 import Logger from '@jitsi/logger';
 
-import {
-    createApiEvent,
-    sendAnalytics
-} from '../../react/features/analytics';
+import { createApiEvent } from '../../react/features/analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../react/features/analytics/functions';
 import {
     approveParticipantAudio,
     approveParticipantVideo,
@@ -30,27 +28,30 @@ import { overwriteConfig } from '../../react/features/base/config/actions';
 import { getWhitelistedJSON } from '../../react/features/base/config/functions.any';
 import { toggleDialog } from '../../react/features/base/dialog/actions';
 import { isSupportedBrowser } from '../../react/features/base/environment/environment';
-import { parseJWTFromURLParams } from '../../react/features/base/jwt';
+import { parseJWTFromURLParams } from '../../react/features/base/jwt/functions';
 import JitsiMeetJS, { JitsiRecordingConstants } from '../../react/features/base/lib-jitsi-meet';
-import { MEDIA_TYPE, VIDEO_TYPE } from '../../react/features/base/media';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../../react/features/base/media/constants';
 import {
-    LOCAL_PARTICIPANT_DEFAULT_ID,
-    getLocalParticipant,
-    getParticipantById,
-    getScreenshareParticipantIds,
-    getVirtualScreenshareParticipantByOwnerId,
     grantModerator,
-    hasRaisedHand,
-    isLocalParticipantModerator,
-    isParticipantModerator,
     kickParticipant,
     overwriteParticipantsNames,
     pinParticipant,
     raiseHand
-} from '../../react/features/base/participants';
-import { updateSettings } from '../../react/features/base/settings';
+} from '../../react/features/base/participants/actions';
+import { LOCAL_PARTICIPANT_DEFAULT_ID } from '../../react/features/base/participants/constants';
+import {
+    getLocalParticipant,
+    getParticipantById,
+    getScreenshareParticipantIds,
+    getVirtualScreenshareParticipantByOwnerId,
+    hasRaisedHand,
+    isLocalParticipantModerator,
+    isParticipantModerator
+} from '../../react/features/base/participants/functions';
+import { updateSettings } from '../../react/features/base/settings/actions';
 import { getDisplayName } from '../../react/features/base/settings/functions.web';
-import { isToggleCameraEnabled, toggleCamera } from '../../react/features/base/tracks';
+import { toggleCamera } from '../../react/features/base/tracks/actions.any';
+import { isToggleCameraEnabled } from '../../react/features/base/tracks/functions';
 import {
     autoAssignToBreakoutRooms,
     closeBreakoutRoom,
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 50eaca73a2..1804b87137 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -7,7 +7,7 @@ import Logger from '@jitsi/logger';
 import EventEmitter from 'events';
 
 import { isMobileBrowser } from '../../react/features/base/environment/utils';
-import { setColorAlpha } from '../../react/features/base/util';
+import { setColorAlpha } from '../../react/features/base/util/helpers';
 import { setDocumentUrl } from '../../react/features/etherpad/actions';
 import { setFilmstripVisible } from '../../react/features/filmstrip/actions.any';
 import {
diff --git a/modules/UI/authentication/AuthHandler.js b/modules/UI/authentication/AuthHandler.js
index b19e4f71f0..68529e8b7f 100644
--- a/modules/UI/authentication/AuthHandler.js
+++ b/modules/UI/authentication/AuthHandler.js
@@ -16,7 +16,7 @@ import {
 } from '../../../react/features/authentication/functions';
 import { getReplaceParticipant } from '../../../react/features/base/config/functions';
 import { isDialogOpen } from '../../../react/features/base/dialog/functions';
-import { setJWT } from '../../../react/features/base/jwt';
+import { setJWT } from '../../../react/features/base/jwt/actions';
 import UIUtil from '../util/UIUtil';
 
 import ExternalLoginDialog from './LoginDialog';
diff --git a/modules/UI/videolayout/LargeVideoManager.js b/modules/UI/videolayout/LargeVideoManager.js
index 6b7236a36f..b5daaaa676 100644
--- a/modules/UI/videolayout/LargeVideoManager.js
+++ b/modules/UI/videolayout/LargeVideoManager.js
@@ -7,24 +7,23 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
-import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
+import { createScreenSharingIssueEvent } from '../../../react/features/analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../react/features/analytics/functions';
 import Avatar from '../../../react/features/base/avatar/components/Avatar';
 import theme from '../../../react/features/base/components/themes/participantsPaneTheme.json';
-import { i18next } from '../../../react/features/base/i18n';
+import i18next from '../../../react/features/base/i18n/i18next';
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
-import { VIDEO_TYPE } from '../../../react/features/base/media';
+import { VIDEO_TYPE } from '../../../react/features/base/media/constants';
 import {
     getLocalParticipant,
     getParticipantById,
     getParticipantDisplayName,
     isLocalScreenshareParticipant,
     isScreenShareParticipant
-} from '../../../react/features/base/participants';
+} from '../../../react/features/base/participants/functions';
 import { getHideSelfView } from '../../../react/features/base/settings/functions.any';
-import {
-    getVideoTrackByParticipant,
-    trackStreamingStatusChanged
-} from '../../../react/features/base/tracks';
+import { trackStreamingStatusChanged } from '../../../react/features/base/tracks/actions.any';
+import { getVideoTrackByParticipant } from '../../../react/features/base/tracks/functions.any';
 import { CHAT_SIZE } from '../../../react/features/chat/constants';
 import {
     isTrackStreamingStatusActive,
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index d89702beac..d8c674269f 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -2,16 +2,16 @@
 
 import Logger from '@jitsi/logger';
 
-import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media/constants';
 import {
     getParticipantById,
     getPinnedParticipant,
     isScreenShareParticipantById
-} from '../../../react/features/base/participants';
+} from '../../../react/features/base/participants/functions';
 import {
     getTrackByMediaTypeAndParticipant,
     getVideoTrackByParticipant
-} from '../../../react/features/base/tracks';
+} from '../../../react/features/base/tracks/functions.any';
 
 import LargeVideoManager from './LargeVideoManager';
 import { VIDEO_CONTAINER_TYPE } from './VideoContainer';
diff --git a/modules/devices/mediaDeviceHelper.js b/modules/devices/mediaDeviceHelper.js
index 74a9c54be0..cde05030eb 100644
--- a/modules/devices/mediaDeviceHelper.js
+++ b/modules/devices/mediaDeviceHelper.js
@@ -7,12 +7,12 @@ import {
 import {
     getAudioOutputDeviceId
 } from '../../react/features/base/devices/functions.web';
+import { updateSettings } from '../../react/features/base/settings/actions';
 import {
     getUserSelectedCameraDeviceId,
     getUserSelectedMicDeviceId,
-    getUserSelectedOutputDeviceId,
-    updateSettings
-} from '../../react/features/base/settings';
+    getUserSelectedOutputDeviceId
+} from '../../react/features/base/settings/functions';
 
 /**
  * Determines if currently selected audio output device should be changed after
diff --git a/modules/keyboardshortcut/keyboardshortcut.js b/modules/keyboardshortcut/keyboardshortcut.js
index 24e8ce061c..9b2ecf41ed 100644
--- a/modules/keyboardshortcut/keyboardshortcut.js
+++ b/modules/keyboardshortcut/keyboardshortcut.js
@@ -5,9 +5,9 @@ import Logger from '@jitsi/logger';
 import {
     ACTION_SHORTCUT_PRESSED as PRESSED,
     ACTION_SHORTCUT_RELEASED as RELEASED,
-    createShortcutEvent,
-    sendAnalytics
-} from '../../react/features/analytics';
+    createShortcutEvent
+} from '../../react/features/analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../react/features/analytics/functions';
 import { clickOnVideo } from '../../react/features/filmstrip/actions';
 import { openSettingsDialog } from '../../react/features/settings/actions';
 import { SETTINGS_TABS } from '../../react/features/settings/constants';
diff --git a/modules/translation/translation.js b/modules/translation/translation.js
index 8b87df2e4e..c25f365445 100644
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -3,7 +3,7 @@
 import $ from 'jquery';
 import jqueryI18next from 'jquery-i18next';
 
-import { i18next } from '../../react/features/base/i18n';
+import i18next from '../../react/features/base/i18n/i18next';
 
 
 type DocumentElement = {
diff --git a/modules/transport/index.js b/modules/transport/index.js
index e79d459c16..65674ae1aa 100644
--- a/modules/transport/index.js
+++ b/modules/transport/index.js
@@ -2,7 +2,7 @@
 // files from API modules will be included in external_api.js.
 import { PostMessageTransportBackend, Transport } from '@jitsi/js-utils/transport';
 
-import { getJitsiMeetGlobalNS } from '../../react/features/base/util';
+import { getJitsiMeetGlobalNS } from '../../react/features/base/util/helpers';
 import { API_ID } from '../API/constants';
 
 
diff --git a/react/features/always-on-top/AudioMuteButton.js b/react/features/always-on-top/AudioMuteButton.js
index 71374209bb..f1a6169095 100644
--- a/react/features/always-on-top/AudioMuteButton.js
+++ b/react/features/always-on-top/AudioMuteButton.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 
 // We need to reference these files directly to avoid loading things that are not available
 // in this environment (e.g. JitsiMeetJS or interfaceConfig)
-import { IconMic, IconMicSlash } from '../base/icons';
+import { IconMic, IconMicSlash } from '../base/icons/svg';
 import type { Props } from '../base/toolbox/components/AbstractButton';
 
 import ToolbarButton from './ToolbarButton';
diff --git a/react/features/always-on-top/HangupButton.js b/react/features/always-on-top/HangupButton.js
index 29b47d1f76..3f39937022 100644
--- a/react/features/always-on-top/HangupButton.js
+++ b/react/features/always-on-top/HangupButton.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 
 // We need to reference these files directly to avoid loading things that are not available
 // in this environment (e.g. JitsiMeetJS or interfaceConfig)
-import { IconHangup } from '../base/icons';
+import { IconHangup } from '../base/icons/svg';
 import type { Props } from '../base/toolbox/components/AbstractButton';
 
 import ToolbarButton from './ToolbarButton';
diff --git a/react/features/always-on-top/ToolbarButton.js b/react/features/always-on-top/ToolbarButton.js
index 70e70c6afb..831b985bf8 100644
--- a/react/features/always-on-top/ToolbarButton.js
+++ b/react/features/always-on-top/ToolbarButton.js
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 
-import { Icon } from '../base/icons';
+import Icon from '../base/icons/components/Icon';
 
 type Props = {
 
diff --git a/react/features/always-on-top/VideoMuteButton.js b/react/features/always-on-top/VideoMuteButton.js
index b3edb7fdc9..f3789e420b 100644
--- a/react/features/always-on-top/VideoMuteButton.js
+++ b/react/features/always-on-top/VideoMuteButton.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 
 // We need to reference these files directly to avoid loading things that are not available
 // in this environment (e.g. JitsiMeetJS or interfaceConfig)
-import { IconVideo, IconVideoOff } from '../base/icons';
+import { IconVideo, IconVideoOff } from '../base/icons/svg';
 import type { Props } from '../base/toolbox/components/AbstractButton';
 
 import ToolbarButton from './ToolbarButton';
diff --git a/react/features/analytics/handlers/index.js b/react/features/analytics/handlers/index.js
deleted file mode 100644
index e019d26006..0000000000
--- a/react/features/analytics/handlers/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as AmplitudeHandler } from './AmplitudeHandler';
-export { default as MatomoHandler } from './MatomoHandler';
diff --git a/react/features/analytics/index.js b/react/features/analytics/index.js
deleted file mode 100644
index d45cd39bd6..0000000000
--- a/react/features/analytics/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './AnalyticsEvents';
-export * from './functions';
diff --git a/react/features/app/components/App.native.js b/react/features/app/components/App.native.js
index 7eefb1d0c9..eaeb7a495b 100644
--- a/react/features/app/components/App.native.js
+++ b/react/features/app/components/App.native.js
@@ -8,8 +8,9 @@ import DialogContainer from '../../base/dialog/components/native/DialogContainer
 import { updateFlags } from '../../base/flags/actions';
 import { CALL_INTEGRATION_ENABLED, SERVER_URL_CHANGE_ENABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
-import { DimensionsDetector, clientResized, setSafeAreaInsets } from '../../base/responsive-ui';
-import { updateSettings } from '../../base/settings';
+import { clientResized, setSafeAreaInsets } from '../../base/responsive-ui/actions';
+import DimensionsDetector from '../../base/responsive-ui/components/DimensionsDetector.native';
+import { updateSettings } from '../../base/settings/actions';
 import { _getRouteToRender } from '../getRouteToRender.native';
 import logger from '../logger';
 
diff --git a/react/features/app/components/index.js b/react/features/app/components/index.js
deleted file mode 100644
index 8a04b4b5c2..0000000000
--- a/react/features/app/components/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './App';
diff --git a/react/features/app/getRouteToRender.web.js b/react/features/app/getRouteToRender.web.js
index a459c3bdee..85d4089c2d 100644
--- a/react/features/app/getRouteToRender.web.js
+++ b/react/features/app/getRouteToRender.web.js
@@ -3,7 +3,7 @@ import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random';
 
 import { isRoomValid } from '../base/conference/functions';
 import { isSupportedBrowser } from '../base/environment/environment';
-import { toState } from '../base/redux';
+import { toState } from '../base/redux/functions';
 import Conference from '../conference/components/web/Conference';
 import { getDeepLinkingPage } from '../deep-linking/functions';
 import UnsupportedDesktopBrowser from '../unsupported-browser/components/UnsupportedDesktopBrowser';
diff --git a/react/features/app/middleware.js b/react/features/app/middleware.js
index 5a50e9f4d7..5d1ae78ad0 100644
--- a/react/features/app/middleware.js
+++ b/react/features/app/middleware.js
@@ -1,13 +1,11 @@
 // @flow
 
-import {
-    createConnectionEvent,
-    sendAnalytics
-} from '../analytics';
+import { createConnectionEvent } from '../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../analytics/functions';
 import { SET_ROOM } from '../base/conference/actionTypes';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../base/connection/actionTypes';
 import { getURLWithoutParams } from '../base/connection/utils';
-import { MiddlewareRegistry } from '../base/redux';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import { inIframe } from '../base/util/iframeUtils';
 
 import { reloadNow } from './actions';
diff --git a/react/features/app/reducer.native.js b/react/features/app/reducer.native.js
index 79255c2409..1401e1921d 100644
--- a/react/features/app/reducer.native.js
+++ b/react/features/app/reducer.native.js
@@ -1,4 +1,4 @@
-import { ReducerRegistry } from '../base/redux';
+import ReducerRegistry from '../base/redux/ReducerRegistry';
 import { _ROOT_NAVIGATION_READY } from '../mobile/navigation/actionTypes';
 
 /**
diff --git a/react/features/audio-level-indicator/components/index.js b/react/features/audio-level-indicator/components/index.js
deleted file mode 100644
index b437a87dc9..0000000000
--- a/react/features/audio-level-indicator/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as AudioLevelIndicator } from './AudioLevelIndicator';
diff --git a/react/features/audio-level-indicator/index.js b/react/features/audio-level-indicator/index.js
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/audio-level-indicator/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/authentication/components/_.native.js b/react/features/authentication/components/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/authentication/components/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/authentication/components/_.web.js b/react/features/authentication/components/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/authentication/components/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/authentication/components/index.js b/react/features/authentication/components/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/authentication/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/authentication/components/index.native.ts b/react/features/authentication/components/index.native.ts
new file mode 100644
index 0000000000..59b1bbed5e
--- /dev/null
+++ b/react/features/authentication/components/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as LoginDialog } from './native/LoginDialog';
diff --git a/react/features/authentication/components/index.web.ts b/react/features/authentication/components/index.web.ts
new file mode 100644
index 0000000000..584e9bc626
--- /dev/null
+++ b/react/features/authentication/components/index.web.ts
@@ -0,0 +1 @@
+export { default as LoginDialog } from './web/LoginDialog';
diff --git a/react/features/authentication/components/native/LoginDialog.js b/react/features/authentication/components/native/LoginDialog.js
index 9e627d894a..e98efda7e2 100644
--- a/react/features/authentication/components/native/LoginDialog.js
+++ b/react/features/authentication/components/native/LoginDialog.js
@@ -6,7 +6,7 @@ import type { Dispatch } from 'redux';
 import { connect } from '../../../base/connection/actions.native';
 import { toJid } from '../../../base/connection/functions';
 import { _abstractMapStateToProps } from '../../../base/dialog/functions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { JitsiConnectionErrors } from '../../../base/lib-jitsi-meet';
 import { authenticateAndUpgradeRole, cancelLogin } from '../../actions.native';
 
diff --git a/react/features/authentication/components/native/WaitForOwnerDialog.js b/react/features/authentication/components/native/WaitForOwnerDialog.js
index bce11b03bc..947e61d99b 100644
--- a/react/features/authentication/components/native/WaitForOwnerDialog.js
+++ b/react/features/authentication/components/native/WaitForOwnerDialog.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { cancelWaitForOwner, openLoginDialog } from '../../actions.native';
 
 /**
diff --git a/react/features/authentication/components/native/index.js b/react/features/authentication/components/native/index.js
deleted file mode 100644
index 52c59fc63f..0000000000
--- a/react/features/authentication/components/native/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as LoginDialog } from './LoginDialog';
-export { default as WaitForOwnerDialog } from './WaitForOwnerDialog';
diff --git a/react/features/authentication/components/web/index.js b/react/features/authentication/components/web/index.js
deleted file mode 100644
index 917f0ce383..0000000000
--- a/react/features/authentication/components/web/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export { default as WaitForOwnerDialog } from './WaitForOwnerDialog';
-export { default as LoginDialog } from './LoginDialog';
diff --git a/react/features/base/app/components/BaseApp.tsx b/react/features/base/app/components/BaseApp.tsx
index 7fbf44c4ea..a4b85b01be 100644
--- a/react/features/base/app/components/BaseApp.tsx
+++ b/react/features/base/app/components/BaseApp.tsx
@@ -15,7 +15,7 @@ import ReducerRegistry from '../../redux/ReducerRegistry';
 import StateListenerRegistry from '../../redux/StateListenerRegistry';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
-import { SoundCollection } from '../../sounds';
+import SoundCollection from '../../sounds/components/SoundCollection';
 import { createDeferred } from '../../util/helpers';
 import { appWillMount, appWillUnmount } from '../actions';
 import logger from '../logger';
diff --git a/react/features/base/avatar/components/native/StatelessAvatar.tsx b/react/features/base/avatar/components/native/StatelessAvatar.tsx
index 901137fbdf..8f03d2590a 100644
--- a/react/features/base/avatar/components/native/StatelessAvatar.tsx
+++ b/react/features/base/avatar/components/native/StatelessAvatar.tsx
@@ -2,9 +2,7 @@ import React, { Component } from 'react';
 import { Image, Text, View } from 'react-native';
 
 import Icon from '../../../icons/components/Icon';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
-import { type StyleType } from '../../../styles';
+import { StyleType } from '../../../styles/functions.native';
 import { isIcon } from '../../functions';
 import { IAvatarProps } from '../../types';
 
diff --git a/react/features/base/avatar/components/native/styles.js b/react/features/base/avatar/components/native/styles.js
index d426b6e5fa..0651b2ee7d 100644
--- a/react/features/base/avatar/components/native/styles.js
+++ b/react/features/base/avatar/components/native/styles.js
@@ -2,7 +2,7 @@
 
 import { StyleSheet } from 'react-native';
 
-import { ColorPalette } from '../../../styles';
+import { ColorPalette } from '../../../styles/components/styles/ColorPalette';
 import { PRESENCE_AVAILABLE_COLOR, PRESENCE_AWAY_COLOR, PRESENCE_BUSY_COLOR, PRESENCE_IDLE_COLOR } from '../styles';
 
 const DEFAULT_SIZE = 65;
diff --git a/react/features/base/conference/middleware.any.js b/react/features/base/conference/middleware.any.js
index 7fadbe8825..43c45fabdc 100644
--- a/react/features/base/conference/middleware.any.js
+++ b/react/features/base/conference/middleware.any.js
@@ -5,9 +5,9 @@ import {
     ACTION_PINNED,
     ACTION_UNPINNED,
     createOfferAnswerFailedEvent,
-    createPinnedEvent,
-    sendAnalytics
-} from '../../analytics';
+    createPinnedEvent
+} from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { reloadNow } from '../../app/actions';
 import { removeLobbyChatParticipant } from '../../chat/actions.any';
 import { openDisplayNamePrompt } from '../../display-name/actions';
@@ -17,18 +17,18 @@ import { setIAmVisitor } from '../../visitors/actions';
 import { overwriteConfig } from '../config/actions';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection/actionTypes';
 import { connect, connectionDisconnected, disconnect } from '../connection/actions';
-import { validateJwt } from '../jwt';
+import { validateJwt } from '../jwt/functions';
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
+import { PARTICIPANT_UPDATED, PIN_PARTICIPANT } from '../participants/actionTypes';
+import { PARTICIPANT_ROLE } from '../participants/constants';
 import {
-    PARTICIPANT_ROLE,
-    PARTICIPANT_UPDATED,
-    PIN_PARTICIPANT,
     getLocalParticipant,
     getParticipantById,
     getPinnedParticipant
-} from '../participants';
-import { MiddlewareRegistry } from '../redux';
-import { TRACK_ADDED, TRACK_REMOVED, destroyLocalTracks } from '../tracks';
+} from '../participants/functions';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+import { TRACK_ADDED, TRACK_REMOVED } from '../tracks/actionTypes';
+import { destroyLocalTracks } from '../tracks/actions.any';
 
 import {
     CONFERENCE_FAILED,
diff --git a/react/features/base/conference/middleware.web.js b/react/features/base/conference/middleware.web.js
index d62fe5880e..c36ec290c4 100644
--- a/react/features/base/conference/middleware.web.js
+++ b/react/features/base/conference/middleware.web.js
@@ -4,7 +4,7 @@ import {
     setSkipPrejoinOnReload
 } from '../../prejoin/actions.web';
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
-import { MiddlewareRegistry } from '../redux';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 
 import { CONFERENCE_FAILED, CONFERENCE_JOINED, CONFERENCE_JOIN_IN_PROGRESS } from './actionTypes';
 import './middleware.any';
diff --git a/react/features/base/dialog/components/native/AlertDialog.js b/react/features/base/dialog/components/native/AlertDialog.js
index f69f17ef2c..16d4f471b2 100644
--- a/react/features/base/dialog/components/native/AlertDialog.js
+++ b/react/features/base/dialog/components/native/AlertDialog.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../i18n';
+import { translate } from '../../../i18n/functions';
 import { _abstractMapStateToProps } from '../../functions';
 import { renderHTML } from '../functions.native';
 
diff --git a/react/features/base/dialog/components/native/ConfirmDialog.js b/react/features/base/dialog/components/native/ConfirmDialog.js
index d53cf1d195..d310407868 100644
--- a/react/features/base/dialog/components/native/ConfirmDialog.js
+++ b/react/features/base/dialog/components/native/ConfirmDialog.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../i18n';
+import { translate } from '../../../i18n/functions';
 import { renderHTML } from '../functions.native';
 
 import AbstractDialog from './AbstractDialog';
diff --git a/react/features/base/dialog/components/native/InputDialog.js b/react/features/base/dialog/components/native/InputDialog.js
index 68adc43572..fa1eb4bacd 100644
--- a/react/features/base/dialog/components/native/InputDialog.js
+++ b/react/features/base/dialog/components/native/InputDialog.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Dialog from 'react-native-dialog';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../i18n';
+import { translate } from '../../../i18n/functions';
 import { _abstractMapStateToProps } from '../../functions';
 
 import AbstractDialog, {
diff --git a/react/features/base/dialog/components/native/styles.js b/react/features/base/dialog/components/native/styles.js
index bbf06482de..d2fe47b499 100644
--- a/react/features/base/dialog/components/native/styles.js
+++ b/react/features/base/dialog/components/native/styles.js
@@ -3,7 +3,7 @@ import { StyleSheet } from 'react-native';
 import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
 import ColorSchemeRegistry from '../../../color-scheme/ColorSchemeRegistry';
 import { schemeColor } from '../../../color-scheme/functions';
-import { BoxModel } from '../../../styles';
+import { BoxModel } from '../../../styles/components/styles/BoxModel';
 import { PREFERRED_DIALOG_SIZE } from '../../constants';
 
 const BORDER_RADIUS = 5;
diff --git a/react/features/base/i18n/index.js b/react/features/base/i18n/index.js
deleted file mode 100644
index fb381af9a4..0000000000
--- a/react/features/base/i18n/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './dateUtil';
-export * from './functions';
-
-// TODO Eventually (e.g. when the non-React Web app is rewritten into React), it
-// should not be necessary to export i18next.
-export { default as i18next, DEFAULT_LANGUAGE,
-    LANGUAGES, TRANSLATION_LANGUAGES, TRANSLATION_LANGUAGES_HEAD } from './i18next';
diff --git a/react/features/base/icons/components/index.js b/react/features/base/icons/components/index.js
deleted file mode 100644
index b8de446c6b..0000000000
--- a/react/features/base/icons/components/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export { default as Icon } from './Icon';
diff --git a/react/features/base/icons/index.js b/react/features/base/icons/index.js
deleted file mode 100644
index a4d827d14a..0000000000
--- a/react/features/base/icons/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export * from './components';
-export * from './svg';
diff --git a/react/features/base/jwt/index.js b/react/features/base/jwt/index.js
deleted file mode 100644
index 3bce1fb332..0000000000
--- a/react/features/base/jwt/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './functions';
-export * from './constants';
diff --git a/react/features/base/known-domains/index.js b/react/features/base/known-domains/index.js
deleted file mode 100644
index e40f04336c..0000000000
--- a/react/features/base/known-domains/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
diff --git a/react/features/base/label/components/_.native.js b/react/features/base/label/components/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/base/label/components/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/base/label/components/_.web.js b/react/features/base/label/components/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/base/label/components/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/base/label/components/index.js b/react/features/base/label/components/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/base/label/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/base/label/components/native/Label.js b/react/features/base/label/components/native/Label.js
index 772dff2b56..81617c16be 100644
--- a/react/features/base/label/components/native/Label.js
+++ b/react/features/base/label/components/native/Label.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { Animated, Text } from 'react-native';
 
 import Icon from '../../../icons/components/Icon';
-import { type StyleType, combineStyles } from '../../../styles';
+import { StyleType, combineStyles } from '../../../styles/functions.native';
 
 import styles from './styles';
 
diff --git a/react/features/base/label/components/native/index.js b/react/features/base/label/components/native/index.js
deleted file mode 100644
index 387c352cbb..0000000000
--- a/react/features/base/label/components/native/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Label } from './Label';
-export { default as ExpandedLabel } from './ExpandedLabel';
diff --git a/react/features/base/label/components/native/styles.js b/react/features/base/label/components/native/styles.js
index 68fb4bff01..d01d3d890b 100644
--- a/react/features/base/label/components/native/styles.js
+++ b/react/features/base/label/components/native/styles.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { ColorPalette } from '../../../styles';
+import { ColorPalette } from '../../../styles/components/styles/ColorPalette';
 import BaseTheme from '../../../ui/components/BaseTheme';
 
 /**
diff --git a/react/features/base/label/components/web/index.js b/react/features/base/label/components/web/index.js
deleted file mode 100644
index 387c352cbb..0000000000
--- a/react/features/base/label/components/web/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Label } from './Label';
-export { default as ExpandedLabel } from './ExpandedLabel';
diff --git a/react/features/base/label/index.js b/react/features/base/label/index.js
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/base/label/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/base/lastn/index.js b/react/features/base/lastn/index.js
deleted file mode 100644
index 08fe9014b1..0000000000
--- a/react/features/base/lastn/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './functions';
diff --git a/react/features/base/logging/index.js b/react/features/base/logging/index.js
deleted file mode 100644
index 08fe9014b1..0000000000
--- a/react/features/base/logging/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './functions';
diff --git a/react/features/base/media/components/AbstractVideoTrack.tsx b/react/features/base/media/components/AbstractVideoTrack.tsx
index 0f9a6e1d2f..cfd4261537 100644
--- a/react/features/base/media/components/AbstractVideoTrack.tsx
+++ b/react/features/base/media/components/AbstractVideoTrack.tsx
@@ -4,8 +4,7 @@ import { IStore } from '../../../app/types';
 import { trackVideoStarted } from '../../tracks/actions';
 import { shouldRenderVideoTrack } from '../functions';
 
-// @ts-ignore
-import { Video } from './_';
+import { Video } from './index';
 
 /**
  * The type of the React {@code Component} props of {@link AbstractVideoTrack}.
diff --git a/react/features/base/media/components/_.native.js b/react/features/base/media/components/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/base/media/components/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/base/media/components/_.web.js b/react/features/base/media/components/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/base/media/components/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/base/media/components/index.js b/react/features/base/media/components/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/base/media/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/base/media/components/index.native.ts b/react/features/base/media/components/index.native.ts
new file mode 100644
index 0000000000..765ce8c57a
--- /dev/null
+++ b/react/features/base/media/components/index.native.ts
@@ -0,0 +1,5 @@
+// @ts-ignore
+export { default as Audio } from './native/Audio';
+
+// @ts-ignore
+export { default as Video } from './native/Video';
diff --git a/react/features/base/media/components/index.web.ts b/react/features/base/media/components/index.web.ts
new file mode 100644
index 0000000000..c78dc17f2c
--- /dev/null
+++ b/react/features/base/media/components/index.web.ts
@@ -0,0 +1,5 @@
+// @ts-ignore
+export { default as Audio } from './web/Audio';
+
+// @ts-ignore
+export { default as Video } from './web/Video';
diff --git a/react/features/base/media/components/native/index.js b/react/features/base/media/components/native/index.js
deleted file mode 100644
index bb42371976..0000000000
--- a/react/features/base/media/components/native/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Audio } from './Audio';
-export { default as Video } from './Video';
-export { default as VideoTrack } from './VideoTrack';
diff --git a/react/features/base/media/components/web/AudioTrack.js b/react/features/base/media/components/web/AudioTrack.js
index 182c5190ef..5b9a9e21ef 100644
--- a/react/features/base/media/components/web/AudioTrack.js
+++ b/react/features/base/media/components/web/AudioTrack.js
@@ -3,7 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { createAudioPlayErrorEvent, createAudioPlaySuccessEvent, sendAnalytics } from '../../../../analytics';
+import { createAudioPlayErrorEvent, createAudioPlaySuccessEvent } from '../../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../../analytics/functions';
 import logger from '../../logger';
 
 /**
diff --git a/react/features/base/media/components/web/index.js b/react/features/base/media/components/web/index.js
deleted file mode 100644
index ff7535409e..0000000000
--- a/react/features/base/media/components/web/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Audio } from './Audio';
-export { default as AudioTrack } from './AudioTrack';
-export { default as Video } from './Video';
-export { default as VideoTrack } from './VideoTrack';
diff --git a/react/features/base/media/index.js b/react/features/base/media/index.js
deleted file mode 100644
index b826983c44..0000000000
--- a/react/features/base/media/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
-export * from './constants';
-export * from './functions';
diff --git a/react/features/base/media/middleware.any.js b/react/features/base/media/middleware.any.js
index 28004e6eee..99602d77a4 100644
--- a/react/features/base/media/middleware.any.js
+++ b/react/features/base/media/middleware.any.js
@@ -4,10 +4,10 @@ import {
     createStartAudioOnlyEvent,
     createStartMutedConfigurationEvent,
     createSyncTrackStateEvent,
-    createTrackMutedEvent,
-    sendAnalytics
-} from '../../analytics';
-import { APP_STATE_CHANGED } from '../../mobile/background';
+    createTrackMutedEvent
+} from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
+import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
 import { showWarningNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import { isForceMuted } from '../../participants-pane/functions';
@@ -17,16 +17,12 @@ import { setAudioOnly } from '../audio-only/actions';
 import { SET_ROOM } from '../conference/actionTypes';
 import { isRoomValid } from '../conference/functions';
 import { getMultipleVideoSendingSupportFeatureFlag } from '../config/functions.any';
-import { getLocalParticipant } from '../participants';
-import { MiddlewareRegistry } from '../redux';
-import { getPropertyValue } from '../settings';
-import {
-    TRACK_ADDED,
-    destroyLocalTracks,
-    isLocalTrackMuted,
-    isLocalVideoTrackDesktop,
-    setTrackMuted
-} from '../tracks';
+import { getLocalParticipant } from '../participants/functions';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+import { getPropertyValue } from '../settings/functions.any';
+import { TRACK_ADDED } from '../tracks/actionTypes';
+import { destroyLocalTracks } from '../tracks/actions.any';
+import { isLocalTrackMuted, isLocalVideoTrackDesktop, setTrackMuted } from '../tracks/functions.any';
 
 import {
     SET_AUDIO_MUTED,
diff --git a/react/features/base/modal/components/functions.native.js b/react/features/base/modal/components/functions.native.js
index 965f21823f..6f8fc3ec8f 100644
--- a/react/features/base/modal/components/functions.native.js
+++ b/react/features/base/modal/components/functions.native.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { toState } from '../../redux';
+import { toState } from '../../redux/functions';
 
 /**
  *
diff --git a/react/features/base/net-info/index.js b/react/features/base/net-info/index.js
deleted file mode 100644
index 3eb256deba..0000000000
--- a/react/features/base/net-info/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './actionTypes';
diff --git a/react/features/base/participants/components/ParticipantView.native.js b/react/features/base/participants/components/ParticipantView.native.js
index b69df635bd..49e2aa3c40 100644
--- a/react/features/base/participants/components/ParticipantView.native.js
+++ b/react/features/base/participants/components/ParticipantView.native.js
@@ -6,14 +6,14 @@ import {
     isTrackStreamingStatusActive,
     isTrackStreamingStatusInactive
 } from '../../../connection-indicator/functions';
-import { SharedVideo } from '../../../shared-video/components/native';
+import SharedVideo from '../../../shared-video/components/native/SharedVideo';
 import Avatar from '../../avatar/components/Avatar';
 import { translate } from '../../i18n/functions';
 import VideoTrack from '../../media/components/native/VideoTrack';
 import { shouldRenderVideoTrack } from '../../media/functions';
 import { Container } from '../../react';
 import { toState } from '../../redux/functions';
-import { TestHint } from '../../testing/components';
+import TestHint from '../../testing/components/TestHint';
 import { getVideoTrackByParticipant } from '../../tracks/functions';
 import { getParticipantById, getParticipantDisplayName, isSharedVideoParticipant } from '../functions';
 
diff --git a/react/features/base/participants/components/styles.js b/react/features/base/participants/components/styles.js
index 0ba9747131..6336a45e06 100644
--- a/react/features/base/participants/components/styles.js
+++ b/react/features/base/participants/components/styles.js
@@ -1,6 +1,7 @@
 // @flow
 
-import { BoxModel, ColorPalette } from '../../styles';
+import { BoxModel } from '../../styles/components/styles/BoxModel';
+import { ColorPalette } from '../../styles/components/styles/ColorPalette';
 
 /**
  * The styles of the feature base/participants.
diff --git a/react/features/base/participants/index.js b/react/features/base/participants/index.js
deleted file mode 100644
index a60a814b1e..0000000000
--- a/react/features/base/participants/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './constants';
-export * from './functions';
diff --git a/react/features/base/popover/index.js b/react/features/base/popover/index.js
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/base/popover/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/base/premeeting/components/index.native.js b/react/features/base/premeeting/components/index.native.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/react/features/base/premeeting/components/index.web.js b/react/features/base/premeeting/components/index.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/base/premeeting/components/index.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/base/premeeting/components/web/Preview.js b/react/features/base/premeeting/components/web/Preview.js
index d3ec5c3251..cbe58101d4 100644
--- a/react/features/base/premeeting/components/web/Preview.js
+++ b/react/features/base/premeeting/components/web/Preview.js
@@ -3,11 +3,11 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 
-import { getDisplayName } from '../../../../base/settings';
+import { getDisplayName } from '../../../../base/settings/functions.web';
 import Avatar from '../../../avatar/components/Avatar';
-import { Video } from '../../../media';
-import { getLocalParticipant } from '../../../participants';
-import { getLocalVideoTrack } from '../../../tracks';
+import Video from '../../../media/components/web/Video';
+import { getLocalParticipant } from '../../../participants/functions';
+import { getLocalVideoTrack } from '../../../tracks/functions.web';
 
 declare var APP: Object;
 
diff --git a/react/features/base/premeeting/components/web/index.js b/react/features/base/premeeting/components/web/index.js
deleted file mode 100644
index c9206da842..0000000000
--- a/react/features/base/premeeting/components/web/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export { default as ActionButton } from './ActionButton';
-export { default as PreMeetingScreen } from './PreMeetingScreen';
diff --git a/react/features/base/premeeting/index.js b/react/features/base/premeeting/index.js
deleted file mode 100644
index 68ddef9ba1..0000000000
--- a/react/features/base/premeeting/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './components';
diff --git a/react/features/base/react/components/native/BaseIndicator.js b/react/features/base/react/components/native/BaseIndicator.js
index 81d8533b80..d0887cb5c4 100644
--- a/react/features/base/react/components/native/BaseIndicator.js
+++ b/react/features/base/react/components/native/BaseIndicator.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { View } from 'react-native';
 
-import { Icon } from '../../../icons';
+import Icon from '../../../icons/components/Icon';
 import { type StyleType } from '../../../styles';
 
 import styles from './indicatorstyles';
diff --git a/react/features/base/react/components/native/LoadingIndicator.js b/react/features/base/react/components/native/LoadingIndicator.js
index a386e2b690..ca35f28bb6 100644
--- a/react/features/base/react/components/native/LoadingIndicator.js
+++ b/react/features/base/react/components/native/LoadingIndicator.js
@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react';
 import { ActivityIndicator } from 'react-native';
 
-import { ColorPalette } from '../../../styles';
+import { ColorPalette } from '../../../styles/components/styles/ColorPalette';
 
 type Props = {|
 
diff --git a/react/features/base/react/components/native/NavigateSectionListEmptyComponent.js b/react/features/base/react/components/native/NavigateSectionListEmptyComponent.js
index dd00125afc..83f888fa85 100644
--- a/react/features/base/react/components/native/NavigateSectionListEmptyComponent.js
+++ b/react/features/base/react/components/native/NavigateSectionListEmptyComponent.js
@@ -3,8 +3,9 @@
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
-import { translate } from '../../../i18n';
-import { Icon, IconArrowDown } from '../../../icons';
+import { translate } from '../../../i18n/functions';
+import Icon from '../../../icons/components/Icon';
+import { IconArrowDown } from '../../../icons/svg';
 
 import styles from './styles';
 
diff --git a/react/features/base/react/components/native/NavigateSectionListItem.js b/react/features/base/react/components/native/NavigateSectionListItem.js
index 6b216906b7..6bc3a52503 100644
--- a/react/features/base/react/components/native/NavigateSectionListItem.js
+++ b/react/features/base/react/components/native/NavigateSectionListItem.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { IconPlus } from '../../../icons';
+import { IconPlus } from '../../../icons/svg';
 import IconButton from '../../../ui/components/native/IconButton';
 import { BUTTON_TYPES } from '../../../ui/constants.any';
 import type { Item } from '../../Types';
diff --git a/react/features/base/react/components/native/indicatorstyles.js b/react/features/base/react/components/native/indicatorstyles.js
index 9682b5474f..409b64e085 100644
--- a/react/features/base/react/components/native/indicatorstyles.js
+++ b/react/features/base/react/components/native/indicatorstyles.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { ColorPalette } from '../../../styles';
+import { ColorPalette } from '../../../styles/components/styles/ColorPalette';
 
 export default {
 
diff --git a/react/features/base/react/components/web/InlineDialogFailure.js b/react/features/base/react/components/web/InlineDialogFailure.js
index 4d15a12cb5..1e0f14b925 100644
--- a/react/features/base/react/components/web/InlineDialogFailure.js
+++ b/react/features/base/react/components/web/InlineDialogFailure.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../../i18n';
+import { translate } from '../../../i18n/functions';
 import Button from '../../../ui/components/web/Button';
 
 
diff --git a/react/features/base/react/components/web/MeetingsList.js b/react/features/base/react/components/web/MeetingsList.js
index f9b8f7d1b4..6335209a41 100644
--- a/react/features/base/react/components/web/MeetingsList.js
+++ b/react/features/base/react/components/web/MeetingsList.js
@@ -2,12 +2,10 @@
 
 import React, { Component } from 'react';
 
-import {
-    getLocalizedDateFormatter,
-    getLocalizedDurationFormatter,
-    translate
-} from '../../../i18n';
-import { Icon, IconTrash } from '../../../icons';
+import { getLocalizedDateFormatter, getLocalizedDurationFormatter } from '../../../i18n/dateUtil';
+import { translate } from '../../../i18n/functions';
+import Icon from '../../../icons/components/Icon';
+import { IconTrash } from '../../../icons/svg';
 
 import Container from './Container';
 import Text from './Text';
diff --git a/react/features/base/react/components/web/Text.js b/react/features/base/react/components/web/Text.js
index 864152ae5a..e1ec80a8e1 100644
--- a/react/features/base/react/components/web/Text.js
+++ b/react/features/base/react/components/web/Text.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { getFixedPlatformStyle } from '../../../styles';
+import { getFixedPlatformStyle } from '../../../styles/functions.web';
 
 /**
  * Implements a React/Web {@link Component} for displaying text similar to React
diff --git a/react/features/base/react/components/web/Watermarks.js b/react/features/base/react/components/web/Watermarks.js
index f75b02d820..7c760ab877 100644
--- a/react/features/base/react/components/web/Watermarks.js
+++ b/react/features/base/react/components/web/Watermarks.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import { isVpaasMeeting } from '../../../../jaas/functions';
-import { translate } from '../../../i18n';
+import { translate } from '../../../i18n/functions';
 
 
 declare var interfaceConfig: Object;
diff --git a/react/features/base/redux/index.js b/react/features/base/redux/index.js
deleted file mode 100644
index 1dcf48b9ec..0000000000
--- a/react/features/base/redux/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './functions';
-export { default as MiddlewareRegistry } from './MiddlewareRegistry';
-export { default as PersistenceRegistry } from './PersistenceRegistry';
-export { default as ReducerRegistry } from './ReducerRegistry';
-export { default as StateListenerRegistry } from './StateListenerRegistry';
diff --git a/react/features/base/responsive-ui/components/index.js b/react/features/base/responsive-ui/components/index.js
deleted file mode 100644
index 5c87f64436..0000000000
--- a/react/features/base/responsive-ui/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as DimensionsDetector } from './DimensionsDetector';
diff --git a/react/features/base/responsive-ui/index.js b/react/features/base/responsive-ui/index.js
deleted file mode 100644
index 291539e5c2..0000000000
--- a/react/features/base/responsive-ui/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
-export * from './constants';
diff --git a/react/features/base/settings/index.js b/react/features/base/settings/index.js
deleted file mode 100644
index a60a814b1e..0000000000
--- a/react/features/base/settings/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './constants';
-export * from './functions';
diff --git a/react/features/base/sounds/actions.ts b/react/features/base/sounds/actions.ts
index aa9b7a99e3..9a7a98bff9 100644
--- a/react/features/base/sounds/actions.ts
+++ b/react/features/base/sounds/actions.ts
@@ -1,7 +1,5 @@
 import { Sounds } from '../config/configType';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
-import type { AudioElement } from '../media';
+import { AudioElement } from '../media/components/AbstractAudio';
 
 import {
     PLAY_SOUND,
diff --git a/react/features/base/sounds/components/SoundCollection.js b/react/features/base/sounds/components/SoundCollection.js
index 1f4b98a63f..8dbcbe7e3b 100644
--- a/react/features/base/sounds/components/SoundCollection.js
+++ b/react/features/base/sounds/components/SoundCollection.js
@@ -3,8 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { Audio } from '../../media';
-import type { AudioElement } from '../../media';
+import { AudioElement } from '../../media/components/AbstractAudio';
+import { Audio } from '../../media/components/index';
 import { _addAudioElement, _removeAudioElement } from '../actions';
 import type { Sound } from '../reducer';
 
diff --git a/react/features/base/sounds/components/index.js b/react/features/base/sounds/components/index.js
deleted file mode 100644
index 68e7552f6f..0000000000
--- a/react/features/base/sounds/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SoundCollection } from './SoundCollection';
diff --git a/react/features/base/sounds/index.js b/react/features/base/sounds/index.js
deleted file mode 100644
index 803dacd06c..0000000000
--- a/react/features/base/sounds/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
diff --git a/react/features/base/sounds/reducer.ts b/react/features/base/sounds/reducer.ts
index 6b7a29283d..78b88600cf 100644
--- a/react/features/base/sounds/reducer.ts
+++ b/react/features/base/sounds/reducer.ts
@@ -1,5 +1,4 @@
-// @ts-ignore
-import type { AudioElement } from '../media';
+import { AudioElement } from '../media/components/AbstractAudio';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { assign } from '../redux/functions';
 
diff --git a/react/features/base/styles/components/index.js b/react/features/base/styles/components/index.js
deleted file mode 100644
index 15c73a4500..0000000000
--- a/react/features/base/styles/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './styles';
diff --git a/react/features/base/styles/components/styles/index.js b/react/features/base/styles/components/styles/index.js
deleted file mode 100644
index 5b08709f4a..0000000000
--- a/react/features/base/styles/components/styles/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './BoxModel';
-export * from './ColorPalette';
diff --git a/react/features/base/styles/index.js b/react/features/base/styles/index.js
deleted file mode 100644
index 8b45add519..0000000000
--- a/react/features/base/styles/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components';
-export * from './functions';
diff --git a/react/features/base/testing/components/TestConnectionInfo.js b/react/features/base/testing/components/TestConnectionInfo.js
index 42fc072e7f..6ed438a49c 100644
--- a/react/features/base/testing/components/TestConnectionInfo.js
+++ b/react/features/base/testing/components/TestConnectionInfo.js
@@ -4,10 +4,10 @@ import React, { Component, Fragment } from 'react';
 import { connect } from 'react-redux';
 
 import statsEmitter from '../../../connection-indicator/statsEmitter';
-import { getLocalParticipant } from '../../participants';
+import { getLocalParticipant } from '../../participants/functions';
 import { isTestModeEnabled } from '../functions';
 
-import { TestHint } from './index';
+import TestHint from './TestHint';
 
 /**
  * Defines the TestConnectionInfo's properties.
diff --git a/react/features/base/testing/components/index.js b/react/features/base/testing/components/index.js
deleted file mode 100644
index 96d58b8238..0000000000
--- a/react/features/base/testing/components/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as TestConnectionInfo } from './TestConnectionInfo';
-export { default as TestHint } from './TestHint';
diff --git a/react/features/base/testing/index.js b/react/features/base/testing/index.js
deleted file mode 100644
index 8b45add519..0000000000
--- a/react/features/base/testing/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components';
-export * from './functions';
diff --git a/react/features/base/toolbox/components/_.native.js b/react/features/base/toolbox/components/_.native.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/react/features/base/toolbox/components/_.web.js b/react/features/base/toolbox/components/_.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/base/toolbox/components/_.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/base/toolbox/components/index.js b/react/features/base/toolbox/components/index.js
deleted file mode 100644
index 5c085dc832..0000000000
--- a/react/features/base/toolbox/components/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// @flow
-
-export { default as AbstractAudioMuteButton } from './AbstractAudioMuteButton';
-export { default as AbstractButton } from './AbstractButton';
-export type { Props as AbstractButtonProps } from './AbstractButton';
-export { default as AbstractHangupButton } from './AbstractHangupButton';
-export { default as AbstractVideoMuteButton } from './AbstractVideoMuteButton';
-export * from './_';
diff --git a/react/features/base/toolbox/components/web/index.js b/react/features/base/toolbox/components/web/index.js
deleted file mode 100644
index f8cc623c65..0000000000
--- a/react/features/base/toolbox/components/web/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export { default as ToolboxButtonWithIcon } from './ToolboxButtonWithIcon';
diff --git a/react/features/base/tracks/index.js b/react/features/base/tracks/index.js
deleted file mode 100644
index 08fe9014b1..0000000000
--- a/react/features/base/tracks/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './functions';
diff --git a/react/features/base/ui/components/index.ts b/react/features/base/ui/components/index.ts
deleted file mode 100644
index 796480f8ed..0000000000
--- a/react/features/base/ui/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @ts-ignore
-export * from './_';
diff --git a/react/features/base/ui/index.ts b/react/features/base/ui/index.ts
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/base/ui/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/base/util/index.js b/react/features/base/util/index.js
deleted file mode 100644
index df5117eb2a..0000000000
--- a/react/features/base/util/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './helpers';
-export * from './httpUtils';
-export * from './loadScript';
-export * from './openURLInBrowser';
-export * from './uri';
-export * from './parseURLParams';
diff --git a/react/features/calendar-sync/actions.web.ts b/react/features/calendar-sync/actions.web.ts
index 4bc82f9211..70d2251ec4 100644
--- a/react/features/calendar-sync/actions.web.ts
+++ b/react/features/calendar-sync/actions.web.ts
@@ -6,7 +6,7 @@ import { sendAnalytics } from '../analytics/functions';
 import { IStore } from '../app/types';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
-import { loadGoogleAPI } from '../google-api';
+import { loadGoogleAPI } from '../google-api/actions';
 
 import {
     CLEAR_CALENDAR_INTEGRATION,
diff --git a/react/features/calendar-sync/components/AddMeetingUrlButton.web.js b/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
index cb6f0978b9..3fc6c33159 100644
--- a/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
+++ b/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
@@ -4,12 +4,11 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
-import {
-    createCalendarClickedEvent,
-    sendAnalytics
-} from '../../analytics';
-import { translate } from '../../base/i18n';
-import { Icon, IconPlus } from '../../base/icons';
+import { createCalendarClickedEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
+import { translate } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconPlus } from '../../base/icons/svg';
 import Tooltip from '../../base/tooltip/components/Tooltip';
 import { updateCalendarEvent } from '../actions';
 
diff --git a/react/features/calendar-sync/components/CalendarList.native.js b/react/features/calendar-sync/components/CalendarList.native.js
index f276f58bf0..adff5d3910 100644
--- a/react/features/calendar-sync/components/CalendarList.native.js
+++ b/react/features/calendar-sync/components/CalendarList.native.js
@@ -8,9 +8,9 @@ import {
 } from 'react-native';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { AbstractPage } from '../../base/react';
-import { openSettings } from '../../mobile/permissions';
+import { openSettings } from '../../mobile/permissions/functions';
 import { refreshCalendar } from '../actions';
 
 import CalendarListContent from './CalendarListContent';
diff --git a/react/features/calendar-sync/components/CalendarList.web.js b/react/features/calendar-sync/components/CalendarList.web.js
index 7082cb6dde..7a0fa5c5e0 100644
--- a/react/features/calendar-sync/components/CalendarList.web.js
+++ b/react/features/calendar-sync/components/CalendarList.web.js
@@ -3,12 +3,11 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import {
-    createCalendarClickedEvent,
-    sendAnalytics
-} from '../../analytics';
-import { translate } from '../../base/i18n';
-import { Icon, IconCalendar } from '../../base/icons';
+import { createCalendarClickedEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
+import { translate } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconCalendar } from '../../base/icons/svg';
 import { AbstractPage } from '../../base/react';
 import Spinner from '../../base/ui/components/web/Spinner';
 import { openSettingsDialog } from '../../settings/actions';
diff --git a/react/features/calendar-sync/components/CalendarListContent.native.js b/react/features/calendar-sync/components/CalendarListContent.native.js
index 30d1fa6131..6a62eaa252 100644
--- a/react/features/calendar-sync/components/CalendarListContent.native.js
+++ b/react/features/calendar-sync/components/CalendarListContent.native.js
@@ -3,13 +3,10 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import {
-    createCalendarClickedEvent,
-    createCalendarSelectedEvent,
-    sendAnalytics
-} from '../../analytics';
+import { createCalendarClickedEvent, createCalendarSelectedEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { appNavigate } from '../../app/actions';
-import { getLocalizedDateFormatter, translate } from '../../base/i18n';
+import { getLocalizedDateFormatter, translate } from '../../base/i18n/functions';
 import { NavigateSectionList } from '../../base/react';
 import { openUpdateCalendarEventDialog, refreshCalendar } from '../actions';
 
diff --git a/react/features/calendar-sync/components/CalendarListContent.web.js b/react/features/calendar-sync/components/CalendarListContent.web.js
index 9768a62998..347cfb8c65 100644
--- a/react/features/calendar-sync/components/CalendarListContent.web.js
+++ b/react/features/calendar-sync/components/CalendarListContent.web.js
@@ -3,11 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import {
-    createCalendarClickedEvent,
-    createCalendarSelectedEvent,
-    sendAnalytics
-} from '../../analytics';
+import { createCalendarClickedEvent, createCalendarSelectedEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { appNavigate } from '../../app/actions';
 import { MeetingsList } from '../../base/react';
 
diff --git a/react/features/calendar-sync/components/JoinButton.web.js b/react/features/calendar-sync/components/JoinButton.web.js
index 89daf28163..3caa39a475 100644
--- a/react/features/calendar-sync/components/JoinButton.web.js
+++ b/react/features/calendar-sync/components/JoinButton.web.js
@@ -2,8 +2,9 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../base/i18n';
-import { Icon, IconPlus } from '../../base/icons';
+import { translate } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconPlus } from '../../base/icons/svg';
 import Tooltip from '../../base/tooltip/components/Tooltip';
 
 /**
diff --git a/react/features/calendar-sync/components/UpdateCalendarEventDialog.native.js b/react/features/calendar-sync/components/UpdateCalendarEventDialog.native.js
index 4b00f7ec88..a7be5ba176 100644
--- a/react/features/calendar-sync/components/UpdateCalendarEventDialog.native.js
+++ b/react/features/calendar-sync/components/UpdateCalendarEventDialog.native.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { updateCalendarEvent } from '../actions';
 
 type Props = {
diff --git a/react/features/calendar-sync/components/styles.js b/react/features/calendar-sync/components/styles.js
index d574560147..42bd01c7f3 100644
--- a/react/features/calendar-sync/components/styles.js
+++ b/react/features/calendar-sync/components/styles.js
@@ -1,4 +1,5 @@
-import { ColorPalette, createStyleSheet } from '../../base/styles';
+import { ColorPalette } from '../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../base/styles/functions.any';
 import BaseTheme from '../../base/ui/components/BaseTheme';
 
 const NOTIFICATION_SIZE = 55;
diff --git a/react/features/calendar-sync/web/googleCalendar.js b/react/features/calendar-sync/web/googleCalendar.js
index dfee6ad0e4..47fabfbd55 100644
--- a/react/features/calendar-sync/web/googleCalendar.js
+++ b/react/features/calendar-sync/web/googleCalendar.js
@@ -4,12 +4,12 @@ import type { Dispatch } from 'redux';
 
 import {
     getCalendarEntries,
-    googleApi,
     loadGoogleAPI,
     signIn,
     updateCalendarEvent,
     updateProfile
-} from '../../google-api';
+} from '../../google-api/actions';
+import googleApi from '../../google-api/googleApi.web';
 
 /**
  * A stateless collection of action creators that implements the expected
diff --git a/react/features/calendar-sync/web/microsoftCalendar.js b/react/features/calendar-sync/web/microsoftCalendar.js
index e7b47b1391..8fca3e18f0 100644
--- a/react/features/calendar-sync/web/microsoftCalendar.js
+++ b/react/features/calendar-sync/web/microsoftCalendar.js
@@ -7,7 +7,8 @@ import { v4 as uuidV4 } from 'uuid';
 import { findWindows } from 'windows-iana';
 
 import { createDeferred } from '../../../../modules/util/helpers';
-import { parseStandardURIString, parseURLParams } from '../../base/util';
+import { parseURLParams } from '../../base/util/parseURLParams';
+import { parseStandardURIString } from '../../base/util/uri';
 import { getShareInfoText } from '../../invite/functions';
 import { setCalendarAPIAuthState } from '../actions';
 
diff --git a/react/features/chat/components/index.native.js b/react/features/chat/components/index.native.js
deleted file mode 100644
index a32ec60612..0000000000
--- a/react/features/chat/components/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './native';
diff --git a/react/features/chat/components/index.native.ts b/react/features/chat/components/index.native.ts
new file mode 100644
index 0000000000..f3409629af
--- /dev/null
+++ b/react/features/chat/components/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as ChatPrivacyDialog } from './native/ChatPrivacyDialog';
diff --git a/react/features/chat/components/index.web.js b/react/features/chat/components/index.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/chat/components/index.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/chat/components/index.web.ts b/react/features/chat/components/index.web.ts
new file mode 100644
index 0000000000..709c50a052
--- /dev/null
+++ b/react/features/chat/components/index.web.ts
@@ -0,0 +1 @@
+export { default as ChatPrivacyDialog } from './web/ChatPrivacyDialog';
diff --git a/react/features/chat/components/native/Chat.js b/react/features/chat/components/native/Chat.js
index f51a731347..1855d14ade 100644
--- a/react/features/chat/components/native/Chat.js
+++ b/react/features/chat/components/native/Chat.js
@@ -4,7 +4,7 @@ import { useIsFocused } from '@react-navigation/native';
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { TabBarLabelCounter } from '../../../mobile/navigation/components/TabBarLabelCounter';
 import { closeChat } from '../../actions.native';
diff --git a/react/features/chat/components/native/ChatButton.js b/react/features/chat/components/native/ChatButton.js
index 9583b15d71..2c6652a47b 100644
--- a/react/features/chat/components/native/ChatButton.js
+++ b/react/features/chat/components/native/ChatButton.js
@@ -2,12 +2,9 @@ import { connect } from 'react-redux';
 
 import { CHAT_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconChatUnread, IconMessage } from '../../../base/icons';
-import {
-    AbstractButton,
-    type AbstractButtonProps
-} from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconChatUnread, IconMessage } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 import { getUnreadPollCount } from '../../../polls/functions';
diff --git a/react/features/chat/components/native/ChatInputBar.js b/react/features/chat/components/native/ChatInputBar.js
index 4768fdde1e..88f65a5d06 100644
--- a/react/features/chat/components/native/ChatInputBar.js
+++ b/react/features/chat/components/native/ChatInputBar.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Platform } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { IconSend } from '../../../base/icons/svg';
 import IconButton from '../../../base/ui/components/native/IconButton';
 import Input from '../../../base/ui/components/native/Input';
diff --git a/react/features/chat/components/native/ChatMessage.js b/react/features/chat/components/native/ChatMessage.js
index 1f1bb049d3..356d1750cb 100644
--- a/react/features/chat/components/native/ChatMessage.js
+++ b/react/features/chat/components/native/ChatMessage.js
@@ -3,7 +3,7 @@ import { Text, View } from 'react-native';
 import { connect } from 'react-redux';
 
 import Avatar from '../../../base/avatar/components/Avatar';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { Linkify } from '../../../base/react';
 import { isGifMessage } from '../../../gifs/functions';
 import { MESSAGE_TYPE_ERROR, MESSAGE_TYPE_LOCAL } from '../../constants';
diff --git a/react/features/chat/components/native/ChatPrivacyDialog.js b/react/features/chat/components/native/ChatPrivacyDialog.js
index 4eb99c780b..17e3d2646c 100644
--- a/react/features/chat/components/native/ChatPrivacyDialog.js
+++ b/react/features/chat/components/native/ChatPrivacyDialog.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { AbstractChatPrivacyDialog, _mapDispatchToProps, _mapStateToProps } from '../AbstractChatPrivacyDialog';
 
 /**
diff --git a/react/features/chat/components/native/MessageContainer.js b/react/features/chat/components/native/MessageContainer.js
index 04761a32b0..07edcea0c3 100644
--- a/react/features/chat/components/native/MessageContainer.js
+++ b/react/features/chat/components/native/MessageContainer.js
@@ -2,7 +2,7 @@ import React, { ReactElement } from 'react';
 import { FlatList, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractMessageContainer, { type Props as AbstractProps }
     from '../AbstractMessageContainer';
 
diff --git a/react/features/chat/components/native/MessageRecipient.js b/react/features/chat/components/native/MessageRecipient.js
index 561649490c..782826c7f1 100644
--- a/react/features/chat/components/native/MessageRecipient.js
+++ b/react/features/chat/components/native/MessageRecipient.js
@@ -2,8 +2,9 @@ import React from 'react';
 import { Text, TouchableHighlight, View } from 'react-native';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { Icon, IconCloseLarge } from '../../../base/icons';
+import { translate } from '../../../base/i18n/functions';
+import Icon from '../../../base/icons/components/Icon';
+import { IconCloseLarge } from '../../../base/icons/svg';
 import {
     setParams
 } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
diff --git a/react/features/chat/components/native/PrivateMessageButton.js b/react/features/chat/components/native/PrivateMessageButton.js
index 6dc273f44a..722bcbb8c4 100644
--- a/react/features/chat/components/native/PrivateMessageButton.js
+++ b/react/features/chat/components/native/PrivateMessageButton.js
@@ -2,10 +2,10 @@ import { connect } from 'react-redux';
 
 import { CHAT_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconMessage, IconReply } from '../../../base/icons';
-import { getParticipantById } from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconMessage, IconReply } from '../../../base/icons/svg';
+import { getParticipantById } from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { handleLobbyChatInitialized, openChat } from '../../../chat/actions.native';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
diff --git a/react/features/chat/components/native/index.js b/react/features/chat/components/native/index.js
deleted file mode 100644
index 0e3e81918d..0000000000
--- a/react/features/chat/components/native/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export { default as Chat } from './Chat';
-export { default as ChatButton } from './ChatButton';
-export { default as ChatPrivacyDialog } from './ChatPrivacyDialog';
diff --git a/react/features/chat/components/native/styles.js b/react/features/chat/components/native/styles.js
index 50963849b2..fa3909add6 100644
--- a/react/features/chat/components/native/styles.js
+++ b/react/features/chat/components/native/styles.js
@@ -1,4 +1,4 @@
-import { BoxModel } from '../../../base/styles';
+import { BoxModel } from '../../../base/styles/components/styles/BoxModel';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 const BUBBLE_RADIUS = 8;
diff --git a/react/features/chat/components/web/Chat.js b/react/features/chat/components/web/Chat.js
index e6d7414767..afa960e7a1 100644
--- a/react/features/chat/components/web/Chat.js
+++ b/react/features/chat/components/web/Chat.js
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import Tabs from '../../../base/ui/components/web/Tabs';
 import PollsPane from '../../../polls/components/web/PollsPane';
 import { toggleChat } from '../../actions.web';
diff --git a/react/features/chat/components/web/ChatHeader.js b/react/features/chat/components/web/ChatHeader.js
index ce6550ea1a..332177a1d9 100644
--- a/react/features/chat/components/web/ChatHeader.js
+++ b/react/features/chat/components/web/ChatHeader.js
@@ -3,8 +3,9 @@
 import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { Icon, IconCloseLarge } from '../../../base/icons';
+import { translate } from '../../../base/i18n/functions';
+import Icon from '../../../base/icons/components/Icon';
+import { IconCloseLarge } from '../../../base/icons/svg';
 import { toggleChat } from '../../actions.web';
 
 type Props = {
diff --git a/react/features/chat/components/web/index.js b/react/features/chat/components/web/index.js
deleted file mode 100644
index d175ebc845..0000000000
--- a/react/features/chat/components/web/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export { default as Chat } from './Chat';
-export { default as ChatButton } from './ChatButton';
-export { default as ChatCounter } from './ChatCounter';
-export { default as ChatPrivacyDialog } from './ChatPrivacyDialog';
diff --git a/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js b/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js
index 1f8063b465..1a28a68edf 100644
--- a/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js
+++ b/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js
@@ -4,17 +4,16 @@ import { jitsiLocalStorage } from '@jitsi/js-utils';
 import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 
-import {
-    createChromeExtensionBannerEvent,
-    sendAnalytics
-} from '../../analytics';
+import { createChromeExtensionBannerEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { getCurrentConference } from '../../base/conference/functions';
 import checkChromeExtensionsInstalled from '../../base/environment/checkChromeExtensionsInstalled';
 import {
     isMobileBrowser
 } from '../../base/environment/utils';
-import { translate } from '../../base/i18n';
-import { Icon, IconCloseLarge } from '../../base/icons';
+import { translate } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconCloseLarge } from '../../base/icons/svg';
 import { browser } from '../../base/lib-jitsi-meet';
 import { isVpaasMeeting } from '../../jaas/functions';
 import logger from '../logger';
diff --git a/react/features/conference/components/native/Conference.js b/react/features/conference/components/native/Conference.js
index 41c1def6d1..bbb68b8082 100644
--- a/react/features/conference/components/native/Conference.js
+++ b/react/features/conference/components/native/Conference.js
@@ -16,13 +16,13 @@ import { connect } from 'react-redux';
 import { appNavigate } from '../../../app/actions';
 import { FULLSCREEN_ENABLED, PIP_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { getParticipantCount } from '../../../base/participants';
+import { getParticipantCount } from '../../../base/participants/functions';
 import { Container, LoadingIndicator, TintedView } from '../../../base/react';
 import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
-import { TestConnectionInfo } from '../../../base/testing';
+import TestConnectionInfo from '../../../base/testing/components/TestConnectionInfo';
 import { isCalendarEnabled } from '../../../calendar-sync/functions.native';
 import DisplayNameLabel from '../../../display-name/components/native/DisplayNameLabel';
-import { BrandingImageBackground } from '../../../dynamic-branding/components/native';
+import BrandingImageBackground from '../../../dynamic-branding/components/native/BrandingImageBackground';
 import Filmstrip from '../../../filmstrip/components/native/Filmstrip';
 import TileView from '../../../filmstrip/components/native/TileView';
 import { FILMSTRIP_SIZE } from '../../../filmstrip/constants';
@@ -35,7 +35,7 @@ import { navigate }
     from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { shouldEnableAutoKnock } from '../../../mobile/navigation/functions';
 import { screen } from '../../../mobile/navigation/routes';
-import { setPictureInPictureEnabled } from '../../../mobile/picture-in-picture';
+import { setPictureInPictureEnabled } from '../../../mobile/picture-in-picture/functions';
 import Captions from '../../../subtitles/components/Captions.native';
 import { setToolboxVisible } from '../../../toolbox/actions';
 import Toolbox from '../../../toolbox/components/native/Toolbox';
diff --git a/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js b/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js
index b6433cf496..fd7d6de877 100644
--- a/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js
+++ b/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js
@@ -1,7 +1,7 @@
 // @flow
 
-import { translate } from '../../../base/i18n';
-import { type Props as AbstractProps, ExpandedLabel } from '../../../base/label';
+import { translate } from '../../../base/i18n/functions';
+import ExpandedLabel, { Props as AbstractProps } from '../../../base/label/components/native/ExpandedLabel';
 
 import { INSECURE_ROOM_NAME_LABEL_COLOR } from './styles';
 
diff --git a/react/features/conference/components/native/InsecureRoomNameLabel.js b/react/features/conference/components/native/InsecureRoomNameLabel.js
index 2ce3cd7ec9..34412ec79b 100644
--- a/react/features/conference/components/native/InsecureRoomNameLabel.js
+++ b/react/features/conference/components/native/InsecureRoomNameLabel.js
@@ -3,8 +3,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { IconWarning } from '../../../base/icons';
-import { Label } from '../../../base/label';
+import { IconWarning } from '../../../base/icons/svg';
+import Label from '../../../base/label/components/native/Label';
 import AbstractInsecureRoomNameLabel, { _mapStateToProps } from '../AbstractInsecureRoomNameLabel';
 
 import styles from './styles';
diff --git a/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js b/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js
index c22a4f150a..f10658ce4f 100644
--- a/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js
+++ b/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js
@@ -1,7 +1,7 @@
 // @flow
 
-import { translate } from '../../../base/i18n';
-import { type Props as AbstractProps, ExpandedLabel } from '../../../base/label';
+import { translate } from '../../../base/i18n/functions';
+import ExpandedLabel, { Props as AbstractProps } from '../../../base/label/components/native/ExpandedLabel';
 
 type Props = AbstractProps & {
     t: Function
diff --git a/react/features/conference/components/native/RaisedHandsCountLabel.js b/react/features/conference/components/native/RaisedHandsCountLabel.js
index 1802330d51..6e9e476705 100644
--- a/react/features/conference/components/native/RaisedHandsCountLabel.js
+++ b/react/features/conference/components/native/RaisedHandsCountLabel.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 
-import { IconRaiseHand } from '../../../base/icons';
-import { Label } from '../../../base/label';
+import { IconRaiseHand } from '../../../base/icons/svg';
+import Label from '../../../base/label/components/native/Label';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 import styles from './styles';
diff --git a/react/features/conference/components/native/TitleBar.js b/react/features/conference/components/native/TitleBar.js
index aa86ddf72d..48e720cd46 100644
--- a/react/features/conference/components/native/TitleBar.js
+++ b/react/features/conference/components/native/TitleBar.js
@@ -8,7 +8,7 @@ import { getConferenceName, getConferenceTimestamp } from '../../../base/confere
 import { CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
 import AudioDeviceToggleButton from '../../../mobile/audio-mode/components/AudioDeviceToggleButton';
-import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
+import PictureInPictureButton from '../../../mobile/picture-in-picture/components/PictureInPictureButton';
 import ParticipantsPaneButton from '../../../participants-pane/components/native/ParticipantsPaneButton';
 import ToggleCameraButton from '../../../toolbox/components/native/ToggleCameraButton';
 import { isToolboxVisible } from '../../../toolbox/functions.native';
diff --git a/react/features/conference/components/native/carmode/CarMode.tsx b/react/features/conference/components/native/carmode/CarMode.tsx
index 06d252ec80..dcfbedfeb8 100644
--- a/react/features/conference/components/native/carmode/CarMode.tsx
+++ b/react/features/conference/components/native/carmode/CarMode.tsx
@@ -9,8 +9,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
 // @ts-ignore
 import { LoadingIndicator, TintedView } from '../../../../base/react';
-// @ts-ignore
-import { isLocalVideoTrackDesktop } from '../../../../base/tracks';
+import { isLocalVideoTrackDesktop } from '../../../../base/tracks/functions.native';
 // @ts-ignore
 import { setPictureInPictureEnabled } from '../../../../mobile/picture-in-picture/functions';
 // @ts-ignore
diff --git a/react/features/conference/components/native/styles.js b/react/features/conference/components/native/styles.js
index a485b64b1b..5a5e050716 100644
--- a/react/features/conference/components/native/styles.js
+++ b/react/features/conference/components/native/styles.js
@@ -1,4 +1,4 @@
-import { fixAndroidViewClipping } from '../../../base/styles';
+import { fixAndroidViewClipping } from '../../../base/styles/functions.native';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 export const INSECURE_ROOM_NAME_LABEL_COLOR = BaseTheme.palette.actionDanger;
diff --git a/react/features/conference/components/web/Conference.js b/react/features/conference/components/web/Conference.js
index 8a856d38a4..4ab19a00ce 100644
--- a/react/features/conference/components/web/Conference.js
+++ b/react/features/conference/components/web/Conference.js
@@ -8,8 +8,8 @@ import VideoLayout from '../../../../../modules/UI/videolayout/VideoLayout';
 import { getConferenceNameForTitle } from '../../../base/conference/functions';
 import { connect, disconnect } from '../../../base/connection/actions.web';
 import { isMobileBrowser } from '../../../base/environment/utils';
-import { translate } from '../../../base/i18n';
-import { setColorAlpha } from '../../../base/util';
+import { translate } from '../../../base/i18n/functions';
+import { setColorAlpha } from '../../../base/util/helpers';
 import Chat from '../../../chat/components/web/Chat';
 import MainFilmstrip from '../../../filmstrip/components/web/MainFilmstrip';
 import ScreenshareFilmstrip from '../../../filmstrip/components/web/ScreenshareFilmstrip';
diff --git a/react/features/conference/components/web/Notice.js b/react/features/conference/components/web/Notice.js
index 77620e22af..2070dce744 100644
--- a/react/features/conference/components/web/Notice.js
+++ b/react/features/conference/components/web/Notice.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 
 declare var config: Object;
 
diff --git a/react/features/conference/components/web/SpeakerStatsLabel.tsx b/react/features/conference/components/web/SpeakerStatsLabel.tsx
index 395bf568c3..62b5460ee4 100644
--- a/react/features/conference/components/web/SpeakerStatsLabel.tsx
+++ b/react/features/conference/components/web/SpeakerStatsLabel.tsx
@@ -7,7 +7,7 @@ import { IconUsers } from '../../../base/icons/svg';
 import Label from '../../../base/label/components/web/Label';
 import { COLORS } from '../../../base/label/constants';
 import { getParticipantCount } from '../../../base/participants/functions';
-import { SpeakerStats } from '../../../speaker-stats';
+import SpeakerStats from '../../../speaker-stats/components/web/SpeakerStats';
 import { isSpeakerStatsDisabled } from '../../../speaker-stats/functions';
 import { iAmVisitor } from '../../../visitors/functions';
 
diff --git a/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js b/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
index f6a04d58e4..d333aaadb4 100644
--- a/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
+++ b/react/features/connection-indicator/components/web/ConnectionIndicatorIcon.js
@@ -4,9 +4,10 @@ import clsx from 'clsx';
 import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Icon, IconConnection, IconConnectionInactive } from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
+import { IconConnection, IconConnectionInactive } from '../../../base/icons/svg';
 import { JitsiTrackEvents } from '../../../base/lib-jitsi-meet';
-import { trackStreamingStatusChanged } from '../../../base/tracks';
+import { trackStreamingStatusChanged } from '../../../base/tracks/actions.web';
 
 type Props = {
 
diff --git a/react/features/deep-linking/components/NoMobileApp.web.js b/react/features/deep-linking/components/NoMobileApp.web.js
index 0a9a919df6..acff8b4e86 100644
--- a/react/features/deep-linking/components/NoMobileApp.web.js
+++ b/react/features/deep-linking/components/NoMobileApp.web.js
@@ -3,7 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { createDeepLinkingPageEvent, sendAnalytics } from '../../analytics';
+import { createDeepLinkingPageEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { IDeeplinkingConfig } from '../../base/config/configType';
 
 
diff --git a/react/features/deep-linking/functions.js b/react/features/deep-linking/functions.js
index e42fabbaed..5c62e54a5a 100644
--- a/react/features/deep-linking/functions.js
+++ b/react/features/deep-linking/functions.js
@@ -2,7 +2,7 @@
 
 import { isMobileBrowser } from '../base/environment/utils';
 import { Platform } from '../base/react';
-import { URI_PROTOCOL_PATTERN } from '../base/util';
+import { URI_PROTOCOL_PATTERN } from '../base/util/uri';
 import { isVpaasMeeting } from '../jaas/functions';
 
 import DeepLinkingDesktopPage from './components/DeepLinkingDesktopPage';
diff --git a/react/features/deep-linking/middleware.js b/react/features/deep-linking/middleware.js
index 814436c075..4fcf86b063 100644
--- a/react/features/deep-linking/middleware.js
+++ b/react/features/deep-linking/middleware.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { MiddlewareRegistry } from '../base/redux';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 
 import { OPEN_DESKTOP_APP } from './actionTypes';
 import { openDesktopApp } from './functions';
diff --git a/react/features/desktop-picker/components/DesktopPickerPane.js b/react/features/desktop-picker/components/DesktopPickerPane.js
index 83e9e4c73c..ac874d630c 100644
--- a/react/features/desktop-picker/components/DesktopPickerPane.js
+++ b/react/features/desktop-picker/components/DesktopPickerPane.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { Platform } from '../../base/react';
 import Checkbox from '../../base/ui/components/web/Checkbox';
 import Spinner from '../../base/ui/components/web/Spinner';
diff --git a/react/features/desktop-picker/components/DesktopSourcePreview.js b/react/features/desktop-picker/components/DesktopSourcePreview.js
index b7e2497726..702d6200fa 100644
--- a/react/features/desktop-picker/components/DesktopSourcePreview.js
+++ b/react/features/desktop-picker/components/DesktopSourcePreview.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 
 
 /**
diff --git a/react/features/display-name/components/index.native.js b/react/features/display-name/components/index.native.js
deleted file mode 100644
index a32ec60612..0000000000
--- a/react/features/display-name/components/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './native';
diff --git a/react/features/display-name/components/index.native.ts b/react/features/display-name/components/index.native.ts
new file mode 100644
index 0000000000..4b38a7b0b9
--- /dev/null
+++ b/react/features/display-name/components/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as DisplayNamePrompt } from './native/DisplayNamePrompt';
diff --git a/react/features/display-name/components/index.web.js b/react/features/display-name/components/index.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/display-name/components/index.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/display-name/components/index.web.ts b/react/features/display-name/components/index.web.ts
new file mode 100644
index 0000000000..7e44e4316a
--- /dev/null
+++ b/react/features/display-name/components/index.web.ts
@@ -0,0 +1 @@
+export { default as DisplayNamePrompt } from './web/DisplayNamePrompt';
diff --git a/react/features/display-name/components/native/index.js b/react/features/display-name/components/native/index.js
deleted file mode 100644
index f31472b2f1..0000000000
--- a/react/features/display-name/components/native/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as DisplayNameLabel } from './DisplayNameLabel';
-export { default as DisplayNamePrompt } from './DisplayNamePrompt';
diff --git a/react/features/display-name/components/web/index.js b/react/features/display-name/components/web/index.js
deleted file mode 100644
index 6b967cb741..0000000000
--- a/react/features/display-name/components/web/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export { default as DisplayName } from './DisplayName';
-export { default as DisplayNamePrompt } from './DisplayNamePrompt';
-export { default as StageParticipantNameLabel } from './StageParticipantNameLabel';
diff --git a/react/features/dynamic-branding/components/native/index.ts b/react/features/dynamic-branding/components/native/index.ts
deleted file mode 100644
index 6f42e7374c..0000000000
--- a/react/features/dynamic-branding/components/native/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as BrandingImageBackground } from './BrandingImageBackground';
diff --git a/react/features/embed-meeting/components/EmbedMeetingTrigger.js b/react/features/embed-meeting/components/EmbedMeetingTrigger.js
index 612da4d071..74bb84c54d 100644
--- a/react/features/embed-meeting/components/EmbedMeetingTrigger.js
+++ b/react/features/embed-meeting/components/EmbedMeetingTrigger.js
@@ -6,7 +6,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { openDialog } from '../../base/dialog';
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 
 import EmbedMeetingDialog from './EmbedMeetingDialog';
 
diff --git a/react/features/etherpad/components/SharedDocumentButton.native.js b/react/features/etherpad/components/SharedDocumentButton.native.js
index 17322ceca1..c6121bb2dd 100644
--- a/react/features/etherpad/components/SharedDocumentButton.native.js
+++ b/react/features/etherpad/components/SharedDocumentButton.native.js
@@ -2,10 +2,11 @@
 
 import { connect } from 'react-redux';
 
-import { createToolbarEvent, sendAnalytics } from '../../analytics';
-import { translate } from '../../base/i18n';
-import { IconShareDoc } from '../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
+import { createToolbarEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
+import { translate } from '../../base/i18n/functions';
+import { IconShareDoc } from '../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../base/toolbox/components/AbstractButton';
 import { navigate } from '../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../mobile/navigation/routes';
 
diff --git a/react/features/etherpad/components/native/SharedDocument.js b/react/features/etherpad/components/native/SharedDocument.js
index d87af7ee68..c496b698db 100644
--- a/react/features/etherpad/components/native/SharedDocument.js
+++ b/react/features/etherpad/components/native/SharedDocument.js
@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import { WebView } from 'react-native-webview';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { LoadingIndicator } from '../../../base/react';
 import { getSharedDocumentUrl } from '../../functions';
diff --git a/react/features/filmstrip/components/native/AudioMutedIndicator.js b/react/features/filmstrip/components/native/AudioMutedIndicator.js
index bed3d25f52..427ea7f09e 100644
--- a/react/features/filmstrip/components/native/AudioMutedIndicator.js
+++ b/react/features/filmstrip/components/native/AudioMutedIndicator.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { IconMicSlash } from '../../../base/icons';
+import { IconMicSlash } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 
 /**
diff --git a/react/features/filmstrip/components/native/Filmstrip.js b/react/features/filmstrip/components/native/Filmstrip.js
index 1ac9d7c248..57b63c57ba 100644
--- a/react/features/filmstrip/components/native/Filmstrip.js
+++ b/react/features/filmstrip/components/native/Filmstrip.js
@@ -5,7 +5,7 @@ import { FlatList } from 'react-native';
 import { SafeAreaView, withSafeAreaInsets } from 'react-native-safe-area-context';
 import { connect } from 'react-redux';
 
-import { getLocalParticipant } from '../../../base/participants';
+import { getLocalParticipant } from '../../../base/participants/functions';
 import { Platform } from '../../../base/react';
 import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
 import { getHideSelfView } from '../../../base/settings/functions.any';
diff --git a/react/features/filmstrip/components/native/PinnedIndicator.js b/react/features/filmstrip/components/native/PinnedIndicator.js
index 50fc0f9bfa..aa169d5d06 100644
--- a/react/features/filmstrip/components/native/PinnedIndicator.js
+++ b/react/features/filmstrip/components/native/PinnedIndicator.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { IconPin } from '../../../base/icons';
+import { IconPin } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 
 /**
diff --git a/react/features/filmstrip/components/native/RaisedHandIndicator.js b/react/features/filmstrip/components/native/RaisedHandIndicator.js
index 5299bd1a85..c2d5216536 100644
--- a/react/features/filmstrip/components/native/RaisedHandIndicator.js
+++ b/react/features/filmstrip/components/native/RaisedHandIndicator.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { View } from 'react-native';
 import { connect } from 'react-redux';
 
-import { IconRaiseHand } from '../../../base/icons';
+import { IconRaiseHand } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 import AbstractRaisedHandIndicator, {
     _mapStateToProps
diff --git a/react/features/filmstrip/components/native/ScreenShareIndicator.js b/react/features/filmstrip/components/native/ScreenShareIndicator.js
index a186f2b241..ce23152cec 100644
--- a/react/features/filmstrip/components/native/ScreenShareIndicator.js
+++ b/react/features/filmstrip/components/native/ScreenShareIndicator.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { IconScreenshare } from '../../../base/icons';
+import { IconScreenshare } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 
 /**
diff --git a/react/features/filmstrip/components/native/Thumbnail.js b/react/features/filmstrip/components/native/Thumbnail.js
index 275ab4c0af..5c76897584 100644
--- a/react/features/filmstrip/components/native/Thumbnail.js
+++ b/react/features/filmstrip/components/native/Thumbnail.js
@@ -4,25 +4,25 @@ import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { JitsiTrackEvents } from '../../../base/lib-jitsi-meet';
-import { MEDIA_TYPE, VIDEO_TYPE } from '../../../base/media';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../../../base/media/constants';
+import { pinParticipant } from '../../../base/participants/actions';
+import ParticipantView from '../../../base/participants/components/ParticipantView.native';
+import { PARTICIPANT_ROLE } from '../../../base/participants/constants';
 import {
-    PARTICIPANT_ROLE,
     getLocalParticipant,
     getParticipantByIdOrUndefined,
     getParticipantCount,
     hasRaisedHand,
     isEveryoneModerator,
-    isScreenShareParticipant,
-    pinParticipant
-} from '../../../base/participants';
-import ParticipantView from '../../../base/participants/components/ParticipantView.native';
+    isScreenShareParticipant
+} from '../../../base/participants/functions';
 import { FakeParticipant } from '../../../base/participants/types';
 import { Container } from '../../../base/react';
+import { trackStreamingStatusChanged } from '../../../base/tracks/actions.native';
 import {
     getTrackByMediaTypeAndParticipant,
-    getVideoTrackByParticipant,
-    trackStreamingStatusChanged
-} from '../../../base/tracks';
+    getVideoTrackByParticipant
+} from '../../../base/tracks/functions.native';
 import ConnectionIndicator from '../../../connection-indicator/components/native/ConnectionIndicator';
 import DisplayNameLabel from '../../../display-name/components/native/DisplayNameLabel';
 import { getGifDisplayMode, getGifForParticipant } from '../../../gifs/functions';
diff --git a/react/features/filmstrip/components/native/TileView.js b/react/features/filmstrip/components/native/TileView.js
index 2f944e5a8e..6d17e89125 100644
--- a/react/features/filmstrip/components/native/TileView.js
+++ b/react/features/filmstrip/components/native/TileView.js
@@ -10,7 +10,7 @@ import { withSafeAreaInsets } from 'react-native-safe-area-context';
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
-import { getLocalParticipant, getParticipantCountWithFake } from '../../../base/participants';
+import { getLocalParticipant, getParticipantCountWithFake } from '../../../base/participants/functions';
 import { getHideSelfView } from '../../../base/settings/functions.any';
 import { setVisibleRemoteParticipants } from '../../actions.web';
 
diff --git a/react/features/filmstrip/components/web/AudioMutedIndicator.js b/react/features/filmstrip/components/web/AudioMutedIndicator.js
index 64e59a131e..0df4f61eb4 100644
--- a/react/features/filmstrip/components/web/AudioMutedIndicator.js
+++ b/react/features/filmstrip/components/web/AudioMutedIndicator.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { IconMicSlash } from '../../../base/icons';
+import { IconMicSlash } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 
 /**
diff --git a/react/features/filmstrip/components/web/AudioTracksContainer.js b/react/features/filmstrip/components/web/AudioTracksContainer.js
index 951f71b9a7..0177b12623 100644
--- a/react/features/filmstrip/components/web/AudioTracksContainer.js
+++ b/react/features/filmstrip/components/web/AudioTracksContainer.js
@@ -2,7 +2,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { AudioTrack, MEDIA_TYPE } from '../../../base/media';
+import AudioTrack from '../../../base/media/components/web/AudioTrack';
+import { MEDIA_TYPE } from '../../../base/media/constants';
 
 /**
  * The type of the React {@code Component} props of {@link AudioTracksContainer}.
diff --git a/react/features/filmstrip/components/web/ScreenShareIndicator.js b/react/features/filmstrip/components/web/ScreenShareIndicator.js
index 32e95a6d26..3a07572e18 100644
--- a/react/features/filmstrip/components/web/ScreenShareIndicator.js
+++ b/react/features/filmstrip/components/web/ScreenShareIndicator.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { IconScreenshare } from '../../../base/icons';
+import { IconScreenshare } from '../../../base/icons/svg';
 import { BaseIndicator } from '../../../base/react';
 
 
diff --git a/react/features/filmstrip/components/web/StatusIndicators.js b/react/features/filmstrip/components/web/StatusIndicators.js
index b11304f008..d358647e08 100644
--- a/react/features/filmstrip/components/web/StatusIndicators.js
+++ b/react/features/filmstrip/components/web/StatusIndicators.js
@@ -3,17 +3,17 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { MEDIA_TYPE } from '../../../base/media';
+import { MEDIA_TYPE } from '../../../base/media/constants';
+import { PARTICIPANT_ROLE } from '../../../base/participants/constants';
 import {
-    PARTICIPANT_ROLE,
     getParticipantByIdOrUndefined,
     isScreenShareParticipantById
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import {
     getVideoTrackByParticipant,
     isLocalTrackMuted,
     isRemoteTrackMuted
-} from '../../../base/tracks';
+} from '../../../base/tracks/functions.web';
 import { getIndicatorsTooltipPosition } from '../../functions.web';
 
 import AudioMutedIndicator from './AudioMutedIndicator';
diff --git a/react/features/filmstrip/components/web/Thumbnail.tsx b/react/features/filmstrip/components/web/Thumbnail.tsx
index a53fa48454..d85bb8dd99 100644
--- a/react/features/filmstrip/components/web/Thumbnail.tsx
+++ b/react/features/filmstrip/components/web/Thumbnail.tsx
@@ -15,7 +15,7 @@ import { isMobileBrowser } from '../../../base/environment/utils';
 import { translate } from '../../../base/i18n/functions';
 import { JitsiTrackEvents } from '../../../base/lib-jitsi-meet';
 // @ts-ignore
-import { VideoTrack } from '../../../base/media';
+import VideoTrack from '../../../base/media/components/web/VideoTrack';
 import { MEDIA_TYPE } from '../../../base/media/constants';
 import { pinParticipant } from '../../../base/participants/actions';
 import {
diff --git a/react/features/filmstrip/components/web/ThumbnailAudioIndicator.js b/react/features/filmstrip/components/web/ThumbnailAudioIndicator.js
index e7d4717eee..bff9aa35c6 100644
--- a/react/features/filmstrip/components/web/ThumbnailAudioIndicator.js
+++ b/react/features/filmstrip/components/web/ThumbnailAudioIndicator.js
@@ -2,7 +2,7 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { AudioLevelIndicator } from '../../../audio-level-indicator';
+import AudioLevelIndicator from '../../../audio-level-indicator/components/AudioLevelIndicator';
 import JitsiMeetJS from '../../../base/lib-jitsi-meet/_';
 
 const JitsiTrackEvents = JitsiMeetJS.events.track;
diff --git a/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js b/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js
index f49bfd1ad4..f27d42152c 100644
--- a/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js
+++ b/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js
@@ -4,7 +4,7 @@ import clsx from 'clsx';
 import React from 'react';
 import { useSelector } from 'react-redux';
 
-import { VideoTrack } from '../../../base/media';
+import VideoTrack from '../../../base/media/components/web/VideoTrack';
 import { LAYOUTS } from '../../../video-layout/constants';
 import { getCurrentLayout } from '../../../video-layout/functions.web';
 
diff --git a/react/features/gifs/components/native/GifsMenu.js b/react/features/gifs/components/native/GifsMenu.js
index ea3a93db27..13b42581f4 100644
--- a/react/features/gifs/components/native/GifsMenu.js
+++ b/react/features/gifs/components/native/GifsMenu.js
@@ -3,7 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { createGifSentEvent, sendAnalytics } from '../../../analytics';
+import { createGifSentEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import Input from '../../../base/ui/components/native/Input';
 import { sendMessage } from '../../../chat/actions.any';
diff --git a/react/features/google-api/components/GoogleSignInButton.native.js b/react/features/google-api/components/GoogleSignInButton.native.js
index 98177ca07b..83d0ef8c32 100644
--- a/react/features/google-api/components/GoogleSignInButton.native.js
+++ b/react/features/google-api/components/GoogleSignInButton.native.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import { Image, TouchableOpacity } from 'react-native';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import Button from '../../base/ui/components/native/Button';
 import { BUTTON_TYPES } from '../../base/ui/constants.native';
 
diff --git a/react/features/google-api/components/index.js b/react/features/google-api/components/index.js
deleted file mode 100644
index 386614a234..0000000000
--- a/react/features/google-api/components/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export { default as GoogleSignInButton } from './GoogleSignInButton';
diff --git a/react/features/google-api/components/styles.js b/react/features/google-api/components/styles.js
index c51330dc95..77f5aa255a 100644
--- a/react/features/google-api/components/styles.js
+++ b/react/features/google-api/components/styles.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { createStyleSheet } from '../../base/styles';
+import { createStyleSheet } from '../../base/styles/functions.any';
 
 /**
  * For styling explanations, see:
diff --git a/react/features/google-api/index.js b/react/features/google-api/index.js
deleted file mode 100644
index 4ab7407810..0000000000
--- a/react/features/google-api/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export * from './actions';
-export * from './components';
-export * from './constants';
-export { default as googleApi } from './googleApi';
diff --git a/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js b/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js
index 64208a4c91..c37ffad445 100644
--- a/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js
+++ b/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js
@@ -10,15 +10,15 @@ import { connect } from 'react-redux';
 
 import { openDialog } from '../../../../base/dialog/actions';
 import AlertDialog from '../../../../base/dialog/components/native/AlertDialog';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
+import Icon from '../../../../base/icons/components/Icon';
 import {
-    Icon,
     IconCheck,
     IconCloseCircle,
     IconPhoneRinging,
     IconSearch,
     IconShare
-} from '../../../../base/icons';
+} from '../../../../base/icons/svg';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
 import { AvatarListItem, type Item } from '../../../../base/react';
 import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
diff --git a/react/features/invite/components/add-people-dialog/native/styles.js b/react/features/invite/components/add-people-dialog/native/styles.js
index cf36fb11f5..5d919461ce 100644
--- a/react/features/invite/components/add-people-dialog/native/styles.js
+++ b/react/features/invite/components/add-people-dialog/native/styles.js
@@ -1,4 +1,4 @@
-import { BoxModel } from '../../../../base/styles';
+import { BoxModel } from '../../../../base/styles/components/styles/BoxModel';
 import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
 
 export const AVATAR_SIZE = 40;
diff --git a/react/features/invite/components/add-people-dialog/web/InviteContactsForm.js b/react/features/invite/components/add-people-dialog/web/InviteContactsForm.js
index 0749eca884..cefff58946 100644
--- a/react/features/invite/components/add-people-dialog/web/InviteContactsForm.js
+++ b/react/features/invite/components/add-people-dialog/web/InviteContactsForm.js
@@ -6,8 +6,9 @@ import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import Avatar from '../../../../base/avatar/components/Avatar';
-import { translate } from '../../../../base/i18n';
-import { Icon, IconPhoneRinging } from '../../../../base/icons';
+import { translate } from '../../../../base/i18n/functions';
+import Icon from '../../../../base/icons/components/Icon';
+import { IconPhoneRinging } from '../../../../base/icons/svg';
 import { MultiSelectAutocomplete } from '../../../../base/react';
 import { isVpaasMeeting } from '../../../../jaas/functions';
 import { hideAddPeopleDialog } from '../../../actions';
diff --git a/react/features/invite/components/add-people-dialog/web/InviteContactsSection.js b/react/features/invite/components/add-people-dialog/web/InviteContactsSection.js
index 42966565d2..3b64faade9 100644
--- a/react/features/invite/components/add-people-dialog/web/InviteContactsSection.js
+++ b/react/features/invite/components/add-people-dialog/web/InviteContactsSection.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 
 import InviteContactsForm from './InviteContactsForm';
 
diff --git a/react/features/invite/components/add-people-dialog/web/LiveStreamSection.js b/react/features/invite/components/add-people-dialog/web/LiveStreamSection.js
index bdc85b6924..32aaeb8370 100644
--- a/react/features/invite/components/add-people-dialog/web/LiveStreamSection.js
+++ b/react/features/invite/components/add-people-dialog/web/LiveStreamSection.js
@@ -4,8 +4,9 @@
 
 import React, { useState } from 'react';
 
-import { translate } from '../../../../base/i18n';
-import { Icon, IconCheck, IconCopy } from '../../../../base/icons';
+import { translate } from '../../../../base/i18n/functions';
+import Icon from '../../../../base/icons/components/Icon';
+import { IconCheck, IconCopy } from '../../../../base/icons/svg';
 import { copyText } from '../../../../base/util/copyText.web';
 
 type Props = {
diff --git a/react/features/invite/components/callee-info/CalleeInfo.js b/react/features/invite/components/callee-info/CalleeInfo.js
index 6acdc5dd77..c57de17596 100644
--- a/react/features/invite/components/callee-info/CalleeInfo.js
+++ b/react/features/invite/components/callee-info/CalleeInfo.js
@@ -4,14 +4,14 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import Avatar from '../../../base/avatar/components/Avatar';
-import { MEDIA_TYPE } from '../../../base/media';
+import { MEDIA_TYPE } from '../../../base/media/constants';
 import {
     getParticipantDisplayName,
     getParticipantPresenceStatus,
     getRemoteParticipants
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import { Container, Text } from '../../../base/react';
-import { isLocalTrackMuted } from '../../../base/tracks';
+import { isLocalTrackMuted } from '../../../base/tracks/functions.any';
 import PresenceLabel from '../../../presence-status/components/PresenceLabel';
 import { CALLING } from '../../../presence-status/constants';
 
diff --git a/react/features/invite/components/callee-info/styles.native.js b/react/features/invite/components/callee-info/styles.native.js
index 1711561dea..3f91f9c0de 100644
--- a/react/features/invite/components/callee-info/styles.native.js
+++ b/react/features/invite/components/callee-info/styles.native.js
@@ -1,6 +1,7 @@
 import { StyleSheet } from 'react-native';
 
-import { ColorPalette, createStyleSheet } from '../../../base/styles';
+import { ColorPalette } from '../../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../../base/styles/functions.native';
 
 export default createStyleSheet({
     // XXX The names below were preserved for the purposes of compatibility
diff --git a/react/features/invite/components/dial-in-info-page/DialInInfoApp.web.js b/react/features/invite/components/dial-in-info-page/DialInInfoApp.web.js
index 0e5a85dd92..6bc8721c11 100644
--- a/react/features/invite/components/dial-in-info-page/DialInInfoApp.web.js
+++ b/react/features/invite/components/dial-in-info-page/DialInInfoApp.web.js
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 
 import { isMobileBrowser } from '../../../base/environment/utils';
-import { i18next } from '../../../base/i18n';
+import i18next from '../../../base/i18n/i18next';
 import { parseURLParams } from '../../../base/util/parseURLParams';
 import { DIAL_IN_INFO_PAGE_PATH_NAME } from '../../constants';
 import { DialInSummary } from '../dial-in-summary';
diff --git a/react/features/invite/components/dial-in-info-page/NoRoomError.web.js b/react/features/invite/components/dial-in-info-page/NoRoomError.web.js
index 5d9fd970d0..99fa49e006 100644
--- a/react/features/invite/components/dial-in-info-page/NoRoomError.web.js
+++ b/react/features/invite/components/dial-in-info-page/NoRoomError.web.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 
 /**
  * The type of the React {@code Component} props of {@link NoRoomError}.
diff --git a/react/features/invite/components/dial-in-summary/native/DialInSummary.js b/react/features/invite/components/dial-in-summary/native/DialInSummary.js
index 1367e6d714..39b7ee3748 100644
--- a/react/features/invite/components/dial-in-summary/native/DialInSummary.js
+++ b/react/features/invite/components/dial-in-summary/native/DialInSummary.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
 import { openDialog } from '../../../../base/dialog/actions';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
 import { LoadingIndicator } from '../../../../base/react';
 import { getDialInfoPageURLForURIString } from '../../../functions';
diff --git a/react/features/invite/components/dial-in-summary/native/DialInSummaryErrorDialog.js b/react/features/invite/components/dial-in-summary/native/DialInSummaryErrorDialog.js
index ff293c72af..6b5c901ac1 100644
--- a/react/features/invite/components/dial-in-summary/native/DialInSummaryErrorDialog.js
+++ b/react/features/invite/components/dial-in-summary/native/DialInSummaryErrorDialog.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import AlertDialog from '../../../../base/dialog/components/native/AlertDialog';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 
 /**
  * Dialog to inform the user that we couldn't fetch the dial-in info page.
diff --git a/react/features/invite/components/dial-in-summary/web/DialInSummary.js b/react/features/invite/components/dial-in-summary/web/DialInSummary.js
index 5549ace25c..c4fe106886 100644
--- a/react/features/invite/components/dial-in-summary/web/DialInSummary.js
+++ b/react/features/invite/components/dial-in-summary/web/DialInSummary.js
@@ -6,7 +6,7 @@ import { withStyles } from '@mui/styles';
 import clsx from 'clsx';
 import React, { Component } from 'react';
 
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import { withPixelLineHeight } from '../../../../base/styles/functions.web';
 import { getDialInConferenceID, getDialInNumbers } from '../../../_utils';
 
diff --git a/react/features/invite/components/dial-in-summary/web/DialInSummaryApp.js b/react/features/invite/components/dial-in-summary/web/DialInSummaryApp.js
index fac24b109a..5c72769490 100644
--- a/react/features/invite/components/dial-in-summary/web/DialInSummaryApp.js
+++ b/react/features/invite/components/dial-in-summary/web/DialInSummaryApp.js
@@ -7,7 +7,7 @@ import BaseApp from '../../../../base/app/components/BaseApp';
 import { isMobileBrowser } from '../../../../base/environment/utils';
 import GlobalStyles from '../../../../base/ui/components/GlobalStyles.web';
 import JitsiThemeProvider from '../../../../base/ui/components/JitsiThemeProvider.web';
-import { parseURLParams } from '../../../../base/util';
+import { parseURLParams } from '../../../../base/util/parseURLParams';
 import { DIAL_IN_INFO_PAGE_PATH_NAME } from '../../../constants';
 import NoRoomError from '../../dial-in-info-page/NoRoomError.web';
 
diff --git a/react/features/large-video/components/LargeVideo.native.js b/react/features/large-video/components/LargeVideo.native.js
index 424d7528f2..3315f54561 100644
--- a/react/features/large-video/components/LargeVideo.native.js
+++ b/react/features/large-video/components/LargeVideo.native.js
@@ -7,11 +7,8 @@ import type { Dispatch } from 'redux';
 import { JitsiTrackEvents } from '../../base/lib-jitsi-meet';
 import ParticipantView from '../../base/participants/components/ParticipantView.native';
 import { getParticipantById, isLocalScreenshareParticipant } from '../../base/participants/functions';
-import {
-    getVideoTrackByParticipant,
-    isLocalVideoTrackDesktop,
-    trackStreamingStatusChanged
-} from '../../base/tracks';
+import { trackStreamingStatusChanged } from '../../base/tracks/actions.native';
+import { getVideoTrackByParticipant, isLocalVideoTrackDesktop } from '../../base/tracks/functions.native';
 
 import { AVATAR_SIZE } from './styles';
 
diff --git a/react/features/large-video/components/LargeVideo.web.js b/react/features/large-video/components/LargeVideo.web.js
index 622f99dcdf..2adc7d2da5 100644
--- a/react/features/large-video/components/LargeVideo.web.js
+++ b/react/features/large-video/components/LargeVideo.web.js
@@ -4,17 +4,17 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import VideoLayout from '../../../../modules/UI/videolayout/VideoLayout';
-import { VIDEO_TYPE } from '../../base/media';
-import { getLocalParticipant } from '../../base/participants';
+import { VIDEO_TYPE } from '../../base/media/constants';
+import { getLocalParticipant } from '../../base/participants/functions';
 import { Watermarks } from '../../base/react';
 import { getHideSelfView } from '../../base/settings/functions.any';
-import { getVideoTrackByParticipant } from '../../base/tracks';
-import { setColorAlpha } from '../../base/util';
+import { getVideoTrackByParticipant } from '../../base/tracks/functions.web';
+import { setColorAlpha } from '../../base/util/helpers';
 import StageParticipantNameLabel from '../../display-name/components/web/StageParticipantNameLabel';
 import { FILMSTRIP_BREAKPOINT } from '../../filmstrip/constants';
 import { getVerticalViewMaxWidth, isFilmstripResizable } from '../../filmstrip/functions.web';
 import { getLargeVideoParticipant } from '../../large-video/functions';
-import { SharedVideo } from '../../shared-video/components/web';
+import SharedVideo from '../../shared-video/components/web/SharedVideo';
 import Captions from '../../subtitles/components/Captions.web';
 import { setTileView } from '../../video-layout/actions';
 import Whiteboard from '../../whiteboard/components/web/Whiteboard';
diff --git a/react/features/lobby/components/native/LobbyChatScreen.js b/react/features/lobby/components/native/LobbyChatScreen.js
index a476f5cb4f..f1c4d71db6 100644
--- a/react/features/lobby/components/native/LobbyChatScreen.js
+++ b/react/features/lobby/components/native/LobbyChatScreen.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import ChatInputBar from '../../../chat/components/native/ChatInputBar';
 import MessageContainer from '../../../chat/components/native/MessageContainer';
diff --git a/react/features/lobby/components/native/LobbyScreen.js b/react/features/lobby/components/native/LobbyScreen.js
index 387cb205a1..91e0adf7de 100644
--- a/react/features/lobby/components/native/LobbyScreen.js
+++ b/react/features/lobby/components/native/LobbyScreen.js
@@ -3,15 +3,15 @@ import { Text, View } from 'react-native';
 import { connect } from 'react-redux';
 
 import { getConferenceName } from '../../../base/conference/functions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { LoadingIndicator } from '../../../base/react';
-import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui';
+import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
 import { BUTTON_TYPES } from '../../../base/ui/constants.native';
-import { BrandingImageBackground } from '../../../dynamic-branding/components/native';
+import BrandingImageBackground from '../../../dynamic-branding/components/native/BrandingImageBackground';
 import LargeVideo from '../../../large-video/components/LargeVideo.native';
 import { navigate }
     from '../../../mobile/navigation/components/lobby/LobbyNavigationContainerRef';
diff --git a/react/features/lobby/components/web/LobbyScreen.js b/react/features/lobby/components/web/LobbyScreen.js
index 55ea3a319f..5db7b4a9aa 100644
--- a/react/features/lobby/components/web/LobbyScreen.js
+++ b/react/features/lobby/components/web/LobbyScreen.js
@@ -3,9 +3,10 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { Icon, IconCloseLarge } from '../../../base/icons';
-import { PreMeetingScreen } from '../../../base/premeeting';
+import { translate } from '../../../base/i18n/functions';
+import Icon from '../../../base/icons/components/Icon';
+import { IconCloseLarge } from '../../../base/icons/svg';
+import PreMeetingScreen from '../../../base/premeeting/components/web/PreMeetingScreen';
 import { LoadingIndicator } from '../../../base/react';
 import Button from '../../../base/ui/components/web/Button';
 import Input from '../../../base/ui/components/web/Input';
diff --git a/react/features/mobile/audio-mode/components/AudioDeviceToggleButton.js b/react/features/mobile/audio-mode/components/AudioDeviceToggleButton.js
index 606413c56f..3f7e06d5f8 100644
--- a/react/features/mobile/audio-mode/components/AudioDeviceToggleButton.js
+++ b/react/features/mobile/audio-mode/components/AudioDeviceToggleButton.js
@@ -2,9 +2,9 @@ import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { openSheet } from '../../../base/dialog/actions';
-import { translate } from '../../../base/i18n';
-import { IconVolumeUp } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconVolumeUp } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 import AudioRoutePickerDialog from './AudioRoutePickerDialog';
 
diff --git a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js
index 76fe2c0b54..9cce6044d0 100644
--- a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js
+++ b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js
@@ -6,15 +6,15 @@ import { connect } from 'react-redux';
 import { hideSheet } from '../../../base/dialog/actions';
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
 import { bottomSheetStyles } from '../../../base/dialog/components/native/styles';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
+import Icon from '../../../base/icons/components/Icon';
 import {
-    Icon,
     IconBluetooth,
     IconCar,
     IconDeviceHeadphone,
     IconPhoneRinging,
     IconVolumeUp
-} from '../../../base/icons';
+} from '../../../base/icons/svg';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 import styles from './styles';
diff --git a/react/features/mobile/audio-mode/components/styles.js b/react/features/mobile/audio-mode/components/styles.js
index 02793b41fe..304e263004 100644
--- a/react/features/mobile/audio-mode/components/styles.js
+++ b/react/features/mobile/audio-mode/components/styles.js
@@ -1,7 +1,7 @@
 // @flow
 
 import { MD_ITEM_HEIGHT } from '../../../base/dialog/components/native/styles';
-import { createStyleSheet } from '../../../base/styles';
+import { createStyleSheet } from '../../../base/styles/functions.any';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 /**
diff --git a/react/features/mobile/audio-mode/index.js b/react/features/mobile/audio-mode/index.js
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/mobile/audio-mode/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/mobile/audio-mode/middleware.js b/react/features/mobile/audio-mode/middleware.js
index b659722aef..ab0dd772f1 100644
--- a/react/features/mobile/audio-mode/middleware.js
+++ b/react/features/mobile/audio-mode/middleware.js
@@ -11,7 +11,7 @@ import {
 import { getCurrentConference } from '../../base/conference/functions';
 import { AUDIO_FOCUS_DISABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
-import { MiddlewareRegistry } from '../../base/redux';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
 
 import { _SET_AUDIOMODE_DEVICES, _SET_AUDIOMODE_SUBSCRIPTIONS } from './actionTypes';
 import logger from './logger';
diff --git a/react/features/mobile/background/index.js b/react/features/mobile/background/index.js
deleted file mode 100644
index e40f04336c..0000000000
--- a/react/features/mobile/background/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
diff --git a/react/features/mobile/background/middleware.native.js b/react/features/mobile/background/middleware.native.js
index 8114721470..70ef801325 100644
--- a/react/features/mobile/background/middleware.native.js
+++ b/react/features/mobile/background/middleware.native.js
@@ -4,7 +4,7 @@ import { AppState } from 'react-native';
 import type { Dispatch } from 'redux';
 
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../../base/app/actionTypes';
-import { MiddlewareRegistry } from '../../base/redux';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
 
 import { _SET_APP_STATE_LISTENER } from './actionTypes';
 import {
diff --git a/react/features/mobile/call-integration/functions.js b/react/features/mobile/call-integration/functions.js
index 00741c9257..747e9e8a9c 100644
--- a/react/features/mobile/call-integration/functions.js
+++ b/react/features/mobile/call-integration/functions.js
@@ -2,7 +2,7 @@
 
 import { CALL_INTEGRATION_ENABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
-import { toState } from '../../base/redux';
+import { toState } from '../../base/redux/functions';
 
 /**
  * Checks if call integration is enabled or not.
diff --git a/react/features/mobile/call-integration/middleware.js b/react/features/mobile/call-integration/middleware.js
index 468dc8dc48..3318802940 100644
--- a/react/features/mobile/call-integration/middleware.js
+++ b/react/features/mobile/call-integration/middleware.js
@@ -3,7 +3,8 @@
 import { Alert, NativeModules, Platform } from 'react-native';
 import { v4 as uuidv4 } from 'uuid';
 
-import { createTrackMutedEvent, sendAnalytics } from '../../analytics';
+import { createTrackMutedEvent } from '../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../analytics/functions';
 import { appNavigate } from '../../app/actions';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../../base/app/actionTypes';
 import { SET_AUDIO_ONLY } from '../../base/audio-only/actionTypes';
@@ -19,18 +20,16 @@ import {
     getCurrentConference
 } from '../../base/conference/functions';
 import { getInviteURL } from '../../base/connection/functions';
-import {
-    MEDIA_TYPE,
-    isVideoMutedByAudioOnly,
-    setAudioMuted
-} from '../../base/media';
-import { MiddlewareRegistry } from '../../base/redux';
+import { setAudioMuted } from '../../base/media/actions';
+import { MEDIA_TYPE } from '../../base/media/constants';
+import { isVideoMutedByAudioOnly } from '../../base/media/functions';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
 import {
     TRACK_ADDED,
     TRACK_REMOVED,
-    TRACK_UPDATED,
-    isLocalTrackMuted
-} from '../../base/tracks';
+    TRACK_UPDATED
+} from '../../base/tracks/actionTypes';
+import { isLocalTrackMuted } from '../../base/tracks/functions.any';
 
 import CallKit from './CallKit';
 import ConnectionService from './ConnectionService';
diff --git a/react/features/mobile/external-api/index.js b/react/features/mobile/external-api/index.js
deleted file mode 100644
index 484b71595f..0000000000
--- a/react/features/mobile/external-api/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './functions';
diff --git a/react/features/mobile/external-api/middleware.js b/react/features/mobile/external-api/middleware.js
index 7c4c1d1bbf..6a76560b76 100644
--- a/react/features/mobile/external-api/middleware.js
+++ b/react/features/mobile/external-api/middleware.js
@@ -27,24 +27,25 @@ import {
 import { getURLWithoutParams } from '../../base/connection/utils';
 import {
     JitsiConferenceEvents } from '../../base/lib-jitsi-meet';
-import { MEDIA_TYPE } from '../../base/media';
 import { SET_AUDIO_MUTED, SET_VIDEO_MUTED } from '../../base/media/actionTypes';
+import { MEDIA_TYPE } from '../../base/media/constants';
+import { PARTICIPANT_JOINED, PARTICIPANT_LEFT } from '../../base/participants/actionTypes';
 import {
-    PARTICIPANT_JOINED,
-    PARTICIPANT_LEFT,
     getLocalParticipant,
     getParticipantById,
     getRemoteParticipants,
     isScreenShareParticipant
-} from '../../base/participants';
-import { MiddlewareRegistry, StateListenerRegistry } from '../../base/redux';
-import { getLocalTracks, isLocalTrackMuted, toggleScreensharing } from '../../base/tracks';
+} from '../../base/participants/functions';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
+import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
+import { toggleScreensharing } from '../../base/tracks/actions.native';
+import { getLocalTracks, isLocalTrackMuted } from '../../base/tracks/functions.native';
 import { CLOSE_CHAT, OPEN_CHAT } from '../../chat/actionTypes';
 import { openChat } from '../../chat/actions';
 import { closeChat, sendMessage, setPrivateMessageRecipient } from '../../chat/actions.any';
 import { setRequestingSubtitles } from '../../subtitles/actions.any';
 import { muteLocal } from '../../video-menu/actions';
-import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture';
+import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture/actionTypes';
 
 import { READY_TO_CLOSE } from './actionTypes';
 import { setParticipantsWithScreenShare } from './actions';
diff --git a/react/features/mobile/full-screen/middleware.js b/react/features/mobile/full-screen/middleware.js
index 3f80c6510c..55d06c73f4 100644
--- a/react/features/mobile/full-screen/middleware.js
+++ b/react/features/mobile/full-screen/middleware.js
@@ -8,7 +8,8 @@ import { isAnyDialogOpen } from '../../base/dialog/functions';
 import { FULLSCREEN_ENABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
 import { Platform } from '../../base/react';
-import { MiddlewareRegistry, StateListenerRegistry } from '../../base/redux';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
+import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
 
 import { _SET_IMMERSIVE_LISTENER } from './actionTypes';
 import { _setImmersiveListener as _setImmersiveListenerA } from './actions';
diff --git a/react/features/mobile/navigation/components/styles.js b/react/features/mobile/navigation/components/styles.js
index 81c1ec37d0..05d7b07319 100644
--- a/react/features/mobile/navigation/components/styles.js
+++ b/react/features/mobile/navigation/components/styles.js
@@ -1,4 +1,4 @@
-import { BoxModel } from '../../../base/styles';
+import { BoxModel } from '../../../base/styles/components/styles/BoxModel';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 
diff --git a/react/features/mobile/navigation/components/welcome/functions.js b/react/features/mobile/navigation/components/welcome/functions.js
index 4d81015a88..2e3b7fa88c 100644
--- a/react/features/mobile/navigation/components/welcome/functions.js
+++ b/react/features/mobile/navigation/components/welcome/functions.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { IconArrowBack } from '../../../../base/icons';
+import { IconArrowBack } from '../../../../base/icons/svg';
 import HeaderNavigationButton
     from '../HeaderNavigationButton';
 
diff --git a/react/features/mobile/navigation/functions.js b/react/features/mobile/navigation/functions.js
index 6b0fa94f06..8c2d3fabeb 100644
--- a/react/features/mobile/navigation/functions.js
+++ b/react/features/mobile/navigation/functions.js
@@ -7,8 +7,8 @@ import { useDispatch } from 'react-redux';
 import { appNavigate } from '../../app/actions';
 import { PREJOIN_PAGE_ENABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
-import { IconCloseLarge } from '../../base/icons';
-import { toState } from '../../base/redux';
+import { IconCloseLarge } from '../../base/icons/svg';
+import { toState } from '../../base/redux/functions';
 import { cancelKnocking } from '../../lobby/actions.native';
 
 import HeaderNavigationButton from './components/HeaderNavigationButton';
diff --git a/react/features/mobile/navigation/middleware.js b/react/features/mobile/navigation/middleware.js
index 7329346c57..6a25dee3be 100644
--- a/react/features/mobile/navigation/middleware.js
+++ b/react/features/mobile/navigation/middleware.js
@@ -1,7 +1,7 @@
 import { appNavigate } from '../../app/actions';
 import { CONFERENCE_FAILED } from '../../base/conference/actionTypes';
 import { JitsiConferenceErrors } from '../../base/lib-jitsi-meet';
-import { MiddlewareRegistry } from '../../base/redux';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
 
 
 MiddlewareRegistry.register(store => next => action => {
diff --git a/react/features/mobile/navigation/rootNavigationContainerRef.js b/react/features/mobile/navigation/rootNavigationContainerRef.js
index 141d560c7e..ea9ff1449b 100644
--- a/react/features/mobile/navigation/rootNavigationContainerRef.js
+++ b/react/features/mobile/navigation/rootNavigationContainerRef.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { toState } from '../../base/redux';
+import { toState } from '../../base/redux/functions';
 import { isWelcomePageEnabled } from '../../welcome/functions';
 import { _sendReadyToClose } from '../external-api/functions';
 
diff --git a/react/features/mobile/permissions/index.js b/react/features/mobile/permissions/index.js
deleted file mode 100644
index 484b71595f..0000000000
--- a/react/features/mobile/permissions/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './functions';
diff --git a/react/features/mobile/permissions/middleware.js b/react/features/mobile/permissions/middleware.js
index 33e601a3f2..7456f748db 100644
--- a/react/features/mobile/permissions/middleware.js
+++ b/react/features/mobile/permissions/middleware.js
@@ -3,9 +3,9 @@
 import { Alert } from 'react-native';
 
 import { isRoomValid } from '../../base/conference/functions';
-import { i18next } from '../../base/i18n';
-import { MiddlewareRegistry } from '../../base/redux';
-import { TRACK_CREATE_ERROR } from '../../base/tracks';
+import i18next from '../../base/i18n/i18next';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
+import { TRACK_CREATE_ERROR } from '../../base/tracks/actionTypes';
 
 import { openSettings } from './functions';
 
diff --git a/react/features/mobile/picture-in-picture/components/PictureInPictureButton.js b/react/features/mobile/picture-in-picture/components/PictureInPictureButton.js
index 7aaa76245c..44713d21b2 100644
--- a/react/features/mobile/picture-in-picture/components/PictureInPictureButton.js
+++ b/react/features/mobile/picture-in-picture/components/PictureInPictureButton.js
@@ -5,9 +5,9 @@ import { connect } from 'react-redux';
 
 import { PIP_ENABLED, PIP_WHILE_SCREEN_SHARING_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconArrowDown } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconArrowDown } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { isLocalVideoTrackDesktop } from '../../../base/tracks/functions';
 import { enterPictureInPicture } from '../actions';
 
diff --git a/react/features/mobile/picture-in-picture/components/index.js b/react/features/mobile/picture-in-picture/components/index.js
deleted file mode 100644
index 46cd68bd52..0000000000
--- a/react/features/mobile/picture-in-picture/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as PictureInPictureButton } from './PictureInPictureButton';
diff --git a/react/features/mobile/picture-in-picture/index.js b/react/features/mobile/picture-in-picture/index.js
deleted file mode 100644
index b845e8859c..0000000000
--- a/react/features/mobile/picture-in-picture/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './actions';
-export * from './actionTypes';
-export * from './components';
-export * from './functions';
diff --git a/react/features/mobile/proximity/middleware.js b/react/features/mobile/proximity/middleware.js
index 6fa4e7c4a0..87d54ea0f6 100644
--- a/react/features/mobile/proximity/middleware.js
+++ b/react/features/mobile/proximity/middleware.js
@@ -1,7 +1,7 @@
 import { NativeModules } from 'react-native';
 
 import { getCurrentConference } from '../../base/conference/functions';
-import { StateListenerRegistry } from '../../base/redux';
+import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
 
 /**
  * State listener which enables / disables the proximity sensor based on the
diff --git a/react/features/mobile/wake-lock/middleware.js b/react/features/mobile/wake-lock/middleware.js
index 45e082d51d..d984bf86fc 100644
--- a/react/features/mobile/wake-lock/middleware.js
+++ b/react/features/mobile/wake-lock/middleware.js
@@ -1,7 +1,7 @@
 import KeepAwake from 'react-native-keep-awake';
 
 import { getCurrentConference } from '../../base/conference/functions';
-import { StateListenerRegistry } from '../../base/redux';
+import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
 
 /**
  * State listener that activates or deactivates the wake lock accordingly. If
diff --git a/react/features/mobile/watchos/middleware.js b/react/features/mobile/watchos/middleware.js
index f7f4e36bda..a0efbf7dac 100644
--- a/react/features/mobile/watchos/middleware.js
+++ b/react/features/mobile/watchos/middleware.js
@@ -7,12 +7,10 @@ import { appNavigate } from '../../app/actions';
 import { APP_WILL_MOUNT } from '../../base/app/actionTypes';
 import { CONFERENCE_JOINED } from '../../base/conference/actionTypes';
 import { getCurrentConferenceUrl } from '../../base/connection/functions';
-import { setAudioMuted } from '../../base/media';
-import {
-    MiddlewareRegistry,
-    StateListenerRegistry,
-    toState
-} from '../../base/redux';
+import { setAudioMuted } from '../../base/media/actions';
+import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
+import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
+import { toState } from '../../base/redux/functions';
 
 import { setConferenceTimestamp, setSessionId, setWatchReachable } from './actions';
 import { CMD_HANG_UP, CMD_JOIN_CONFERENCE, CMD_SET_MUTED, MAX_RECENT_URLS } from './constants';
diff --git a/react/features/no-audio-signal/components/DialInLink.js b/react/features/no-audio-signal/components/DialInLink.js
index 3f09c20dce..1c86cad9a8 100644
--- a/react/features/no-audio-signal/components/DialInLink.js
+++ b/react/features/no-audio-signal/components/DialInLink.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { getDialInfoPageURL, shouldDisplayDialIn } from '../../invite/functions';
 
 /**
diff --git a/react/features/noise-suppression/components/index.ts b/react/features/noise-suppression/components/index.ts
deleted file mode 100644
index 36653a2236..0000000000
--- a/react/features/noise-suppression/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as NoiseSuppressionButton } from './NoiseSuppressionButton';
diff --git a/react/features/notifications/components/index.native.ts b/react/features/notifications/components/index.native.ts
index 738c4d2b8a..f95eb32b3f 100644
--- a/react/features/notifications/components/index.native.ts
+++ b/react/features/notifications/components/index.native.ts
@@ -1 +1 @@
-export * from './native';
+export { default as NotificationsContainer } from './native/NotificationsContainer';
diff --git a/react/features/notifications/components/index.web.ts b/react/features/notifications/components/index.web.ts
index b80c83af34..13e34bbeb1 100644
--- a/react/features/notifications/components/index.web.ts
+++ b/react/features/notifications/components/index.web.ts
@@ -1 +1 @@
-export * from './web';
+export { default as NotificationsContainer } from './web/NotificationsContainer';
diff --git a/react/features/notifications/components/native/index.ts b/react/features/notifications/components/native/index.ts
deleted file mode 100644
index 642f2f2837..0000000000
--- a/react/features/notifications/components/native/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Notification } from './Notification';
-export { default as NotificationsContainer } from './NotificationsContainer';
diff --git a/react/features/notifications/components/web/index.ts b/react/features/notifications/components/web/index.ts
deleted file mode 100644
index 642f2f2837..0000000000
--- a/react/features/notifications/components/web/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Notification } from './Notification';
-export { default as NotificationsContainer } from './NotificationsContainer';
diff --git a/react/features/old-client-notification/components/OldElectronAPPNotificationDescription.js b/react/features/old-client-notification/components/OldElectronAPPNotificationDescription.js
index 43f3d11789..e5be06da99 100644
--- a/react/features/old-client-notification/components/OldElectronAPPNotificationDescription.js
+++ b/react/features/old-client-notification/components/OldElectronAPPNotificationDescription.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 
 /**
  * The type of the React {@code Component} props of {@link OldElectronAPPNotificationDescription}.
diff --git a/react/features/overlay/components/web/ReloadButton.js b/react/features/overlay/components/web/ReloadButton.js
index e705031128..dd71bdc810 100644
--- a/react/features/overlay/components/web/ReloadButton.js
+++ b/react/features/overlay/components/web/ReloadButton.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import { reloadNow } from '../../../app/actions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 
 /**
  * The type of the React {@code Component} props of {@link ReloadButton}.
diff --git a/react/features/overlay/components/web/SuspendedOverlay.js b/react/features/overlay/components/web/SuspendedOverlay.js
index 77a974df8c..1064b3938c 100644
--- a/react/features/overlay/components/web/SuspendedOverlay.js
+++ b/react/features/overlay/components/web/SuspendedOverlay.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 
 import AbstractSuspendedOverlay from './AbstractSuspendedOverlay';
 import OverlayFrame from './OverlayFrame';
diff --git a/react/features/overlay/components/web/UserMediaPermissionsOverlay.js b/react/features/overlay/components/web/UserMediaPermissionsOverlay.js
index 6bb5582670..290bc6ae6b 100644
--- a/react/features/overlay/components/web/UserMediaPermissionsOverlay.js
+++ b/react/features/overlay/components/web/UserMediaPermissionsOverlay.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate, translateToHTML } from '../../../base/i18n';
+import { translate, translateToHTML } from '../../../base/i18n/functions';
 
 import AbstractUserMediaPermissionsOverlay, { abstractMapStateToProps }
     from './AbstractUserMediaPermissionsOverlay';
diff --git a/react/features/participants-pane/actions.native.ts b/react/features/participants-pane/actions.native.ts
index f7a08f78e4..49edb900c6 100644
--- a/react/features/participants-pane/actions.native.ts
+++ b/react/features/participants-pane/actions.native.ts
@@ -6,12 +6,12 @@ import { navigate }
     from '../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 // @ts-ignore
 import { screen } from '../mobile/navigation/routes';
-// @ts-ignore
-import { LocalVideoMenu } from '../video-menu/components/native';
 import ConnectionStatusComponent
 // @ts-ignore
     from '../video-menu/components/native/ConnectionStatusComponent';
 // @ts-ignore
+import LocalVideoMenu from '../video-menu/components/native/LocalVideoMenu';
+// @ts-ignore
 import RemoteVideoMenu from '../video-menu/components/native/RemoteVideoMenu';
 // @ts-ignore
 import SharedVideoMenu from '../video-menu/components/native/SharedVideoMenu';
diff --git a/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomContextMenu.js b/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomContextMenu.js
index b9664b34aa..685c728ca7 100644
--- a/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomContextMenu.js
+++ b/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomContextMenu.js
@@ -4,15 +4,13 @@ import { TouchableOpacity } from 'react-native';
 import { Text } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { createBreakoutRoomsEvent, sendAnalytics } from '../../../../../analytics';
+import { createBreakoutRoomsEvent } from '../../../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../../../analytics/functions';
 import { hideSheet } from '../../../../../base/dialog/actions';
 import BottomSheet from '../../../../../base/dialog/components/native/BottomSheet';
-import {
-    Icon,
-    IconCloseLarge,
-    IconRingGroup
-} from '../../../../../base/icons';
-import { isLocalParticipantModerator } from '../../../../../base/participants';
+import Icon from '../../../../../base/icons/components/Icon';
+import { IconCloseLarge, IconRingGroup } from '../../../../../base/icons/svg';
+import { isLocalParticipantModerator } from '../../../../../base/participants/functions';
 import { closeBreakoutRoom, moveToRoom, removeBreakoutRoom } from '../../../../../breakout-rooms/actions';
 import { getBreakoutRoomsConfig } from '../../../../../breakout-rooms/functions';
 import styles from '../../../native/styles';
diff --git a/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomParticipantItem.js b/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomParticipantItem.js
index 950614c289..afdea62a09 100644
--- a/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomParticipantItem.js
+++ b/react/features/participants-pane/components/breakout-rooms/components/native/BreakoutRoomParticipantItem.js
@@ -3,7 +3,7 @@
 import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { isLocalParticipantModerator, isParticipantModerator } from '../../../../../base/participants';
+import { isLocalParticipantModerator, isParticipantModerator } from '../../../../../base/participants/functions';
 import { showRoomParticipantMenu } from '../../../../actions.native';
 import ParticipantItem from '../../../native/ParticipantItem';
 
diff --git a/react/features/participants-pane/components/native/CollapsibleList.js b/react/features/participants-pane/components/native/CollapsibleList.js
index 85b45e9131..9c455b2c57 100644
--- a/react/features/participants-pane/components/native/CollapsibleList.js
+++ b/react/features/participants-pane/components/native/CollapsibleList.js
@@ -3,8 +3,9 @@
 import React, { useCallback, useState } from 'react';
 import { Text, TouchableOpacity, View } from 'react-native';
 
-import { Icon, IconArrowDown, IconArrowUp } from '../../../base/icons';
-import { StyleType } from '../../../base/styles';
+import Icon from '../../../base/icons/components/Icon';
+import { IconArrowDown, IconArrowUp } from '../../../base/icons/svg';
+import { StyleType } from '../../../base/styles/functions.native';
 import styles from '../breakout-rooms/components/native/styles';
 
 type Props = {
diff --git a/react/features/participants-pane/components/native/ContextMenuLobbyParticipantReject.js b/react/features/participants-pane/components/native/ContextMenuLobbyParticipantReject.js
index 75e5f166bd..3a88217026 100644
--- a/react/features/participants-pane/components/native/ContextMenuLobbyParticipantReject.js
+++ b/react/features/participants-pane/components/native/ContextMenuLobbyParticipantReject.js
@@ -6,9 +6,8 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { Avatar } from '../../../base/avatar';
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
-import {
-    Icon, IconCloseLarge
-} from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
+import { IconCloseLarge } from '../../../base/icons/svg';
 import { setKnockingParticipantApproval } from '../../../lobby/actions.native';
 import { getKnockingParticipantsById } from '../../../lobby/functions';
 
diff --git a/react/features/participants-pane/components/native/ContextMenuMore.js b/react/features/participants-pane/components/native/ContextMenuMore.js
index 9f0731bad2..54de7a87e4 100644
--- a/react/features/participants-pane/components/native/ContextMenuMore.js
+++ b/react/features/participants-pane/components/native/ContextMenuMore.js
@@ -16,13 +16,10 @@ import {
 } from '../../../av-moderation/functions';
 import { hideSheet, openDialog } from '../../../base/dialog/actions';
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
-import {
-    Icon,
-    IconCheck,
-    IconVideoOff
-} from '../../../base/icons';
-import { MEDIA_TYPE } from '../../../base/media';
-import { getParticipantCount, isEveryoneModerator } from '../../../base/participants';
+import Icon from '../../../base/icons/components/Icon';
+import { IconCheck, IconVideoOff } from '../../../base/icons/svg';
+import { MEDIA_TYPE } from '../../../base/media/constants';
+import { getParticipantCount, isEveryoneModerator } from '../../../base/participants/functions';
 import MuteEveryonesVideoDialog
     from '../../../video-menu/components/native/MuteEveryonesVideoDialog';
 
diff --git a/react/features/participants-pane/components/native/MeetingParticipantItem.js b/react/features/participants-pane/components/native/MeetingParticipantItem.js
index 8976922f79..d7204c4b80 100644
--- a/react/features/participants-pane/components/native/MeetingParticipantItem.js
+++ b/react/features/participants-pane/components/native/MeetingParticipantItem.js
@@ -1,19 +1,19 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import {
     getLocalParticipant,
     getParticipantById,
     getParticipantDisplayName,
     hasRaisedHand,
     isParticipantModerator
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import { FakeParticipant } from '../../../base/participants/types';
 import {
     isParticipantAudioMuted,
     isParticipantVideoMuted
-} from '../../../base/tracks';
+} from '../../../base/tracks/functions.native';
 import { showConnectionStatus, showContextMenuDetails, showSharedVideoMenu } from '../../actions.native';
 import type { MediaState } from '../../constants';
 import { getParticipantAudioMediaState, getParticipantVideoMediaState } from '../../functions';
diff --git a/react/features/participants-pane/components/native/ParticipantsPane.js b/react/features/participants-pane/components/native/ParticipantsPane.js
index bbbd1d2488..d858c6abba 100644
--- a/react/features/participants-pane/components/native/ParticipantsPane.js
+++ b/react/features/participants-pane/components/native/ParticipantsPane.js
@@ -4,8 +4,8 @@ import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
-import { isLocalParticipantModerator } from '../../../base/participants';
-import { equals } from '../../../base/redux';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
+import { equals } from '../../../base/redux/functions';
 import {
     getBreakoutRooms,
     getCurrentRoomId,
diff --git a/react/features/participants-pane/components/native/ParticipantsPaneButton.js b/react/features/participants-pane/components/native/ParticipantsPaneButton.js
index 40d690376e..54f5ae0d28 100644
--- a/react/features/participants-pane/components/native/ParticipantsPaneButton.js
+++ b/react/features/participants-pane/components/native/ParticipantsPaneButton.js
@@ -3,9 +3,9 @@
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
-import { translate } from '../../../base/i18n';
-import { IconUsers } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconUsers } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { navigate }
     from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
diff --git a/react/features/participants-pane/components/native/RaisedHandIndicator.js b/react/features/participants-pane/components/native/RaisedHandIndicator.js
index bd977364a9..03e35f93bb 100644
--- a/react/features/participants-pane/components/native/RaisedHandIndicator.js
+++ b/react/features/participants-pane/components/native/RaisedHandIndicator.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import { View } from 'react-native';
 
-import { Icon, IconRaiseHand } from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
+import { IconRaiseHand } from '../../../base/icons/svg';
 
 import styles from './styles';
 
diff --git a/react/features/participants-pane/components/web/MeetingParticipantContextMenu.js b/react/features/participants-pane/components/web/MeetingParticipantContextMenu.js
index 3bd0bb1bdc..84424529b7 100644
--- a/react/features/participants-pane/components/web/MeetingParticipantContextMenu.js
+++ b/react/features/participants-pane/components/web/MeetingParticipantContextMenu.js
@@ -2,11 +2,11 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import {
     getLocalParticipant,
     getParticipantByIdOrUndefined
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import FakeParticipantContextMenu from '../../../video-menu/components/web/FakeParticipantContextMenu';
 import ParticipantContextMenu from '../../../video-menu/components/web/ParticipantContextMenu';
 
diff --git a/react/features/participants-pane/components/web/MeetingParticipantItem.js b/react/features/participants-pane/components/web/MeetingParticipantItem.js
index ee9e9971ed..11796e807c 100644
--- a/react/features/participants-pane/components/web/MeetingParticipantItem.js
+++ b/react/features/participants-pane/components/web/MeetingParticipantItem.js
@@ -4,20 +4,20 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 
 import { JitsiTrackEvents } from '../../../base/lib-jitsi-meet';
-import { MEDIA_TYPE } from '../../../base/media';
+import { MEDIA_TYPE } from '../../../base/media/constants';
 import {
     getLocalParticipant,
     getParticipantByIdOrUndefined,
     getParticipantDisplayName,
     hasRaisedHand,
     isParticipantModerator
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import {
     getLocalAudioTrack,
     getTrackByMediaTypeAndParticipant,
     isParticipantAudioMuted,
     isParticipantVideoMuted
-} from '../../../base/tracks';
+} from '../../../base/tracks/functions.web';
 import { ACTION_TRIGGER, MEDIA_STATE, type MediaState } from '../../constants';
 import {
     getParticipantAudioMediaState,
diff --git a/react/features/polls/components/native/PollResults.js b/react/features/polls/components/native/PollResults.js
index 010cd69e47..b2c0a8b44a 100644
--- a/react/features/polls/components/native/PollResults.js
+++ b/react/features/polls/components/native/PollResults.js
@@ -4,7 +4,7 @@ import React, { useCallback } from 'react';
 import { FlatList, Text, View } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { getLocalParticipant } from '../../../base/participants';
+import { getLocalParticipant } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/native/Button';
 import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import AbstractPollResults from '../AbstractPollResults';
diff --git a/react/features/polls/components/native/PollsList.js b/react/features/polls/components/native/PollsList.js
index 609af0b0d9..6a48bac1d8 100644
--- a/react/features/polls/components/native/PollsList.js
+++ b/react/features/polls/components/native/PollsList.js
@@ -4,7 +4,8 @@ import { FlatList, View } from 'react-native';
 import { Text } from 'react-native-paper';
 import { useSelector } from 'react-redux';
 
-import { Icon, IconMessage } from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
+import { IconMessage } from '../../../base/icons/svg';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 
diff --git a/react/features/polls/components/native/styles.js b/react/features/polls/components/native/styles.js
index c7c4002215..01fc209c14 100644
--- a/react/features/polls/components/native/styles.js
+++ b/react/features/polls/components/native/styles.js
@@ -1,4 +1,4 @@
-import { createStyleSheet } from '../../../base/styles';
+import { createStyleSheet } from '../../../base/styles/functions.native';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 
diff --git a/react/features/prejoin/components/native/Prejoin.tsx b/react/features/prejoin/components/native/Prejoin.tsx
index f7a810b4de..baeda70a97 100644
--- a/react/features/prejoin/components/native/Prejoin.tsx
+++ b/react/features/prejoin/components/native/Prejoin.tsx
@@ -29,7 +29,7 @@ import { updateSettings } from '../../../base/settings/actions';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
 import { BUTTON_TYPES } from '../../../base/ui/constants.native';
-import { BrandingImageBackground } from '../../../dynamic-branding/components/native';
+import BrandingImageBackground from '../../../dynamic-branding/components/native/BrandingImageBackground';
 // @ts-ignore
 import LargeVideo from '../../../large-video/components/LargeVideo.native';
 // @ts-ignore
diff --git a/react/features/prejoin/components/web/PrejoinApp.js b/react/features/prejoin/components/web/PrejoinApp.js
index 947e560c89..f616e3cc36 100644
--- a/react/features/prejoin/components/web/PrejoinApp.js
+++ b/react/features/prejoin/components/web/PrejoinApp.js
@@ -7,7 +7,7 @@ import { batch } from 'react-redux';
 import BaseApp from '../../../base/app/components/BaseApp';
 import { getConferenceOptions } from '../../../base/conference/functions';
 import { setConfig } from '../../../base/config/actions';
-import { createPrejoinTracks } from '../../../base/tracks';
+import { createPrejoinTracks } from '../../../base/tracks/functions.web';
 import GlobalStyles from '../../../base/ui/components/GlobalStyles.web';
 import JitsiThemeProvider from '../../../base/ui/components/JitsiThemeProvider.web';
 import DialogContainer from '../../../base/ui/components/web/DialogContainer';
diff --git a/react/features/prejoin/components/web/PrejoinThirdParty.js b/react/features/prejoin/components/web/PrejoinThirdParty.js
index 54e84a9641..c8bfa86a04 100644
--- a/react/features/prejoin/components/web/PrejoinThirdParty.js
+++ b/react/features/prejoin/components/web/PrejoinThirdParty.js
@@ -3,10 +3,10 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { isVideoMutedByUser } from '../../../base/media';
-import { PreMeetingScreen } from '../../../base/premeeting';
-import { getLocalJitsiVideoTrack } from '../../../base/tracks';
+import { translate } from '../../../base/i18n/functions';
+import { isVideoMutedByUser } from '../../../base/media/functions';
+import PreMeetingScreen from '../../../base/premeeting/components/web/PreMeetingScreen';
+import { getLocalJitsiVideoTrack } from '../../../base/tracks/functions.web';
 import { isDeviceStatusVisible } from '../../functions';
 
 type Props = {
diff --git a/react/features/presence-status/components/PresenceLabel.js b/react/features/presence-status/components/PresenceLabel.js
index 08951f3f18..709bc9fe5c 100644
--- a/react/features/presence-status/components/PresenceLabel.js
+++ b/react/features/presence-status/components/PresenceLabel.js
@@ -3,8 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { getParticipantById } from '../../base/participants';
+import { translate } from '../../base/i18n/functions';
+import { getParticipantById } from '../../base/participants/functions';
 import { Text } from '../../base/react';
 import { STATUS_TO_I18N_KEY } from '../constants';
 import { presenceStatusDisabled } from '../functions';
diff --git a/react/features/reactions/components/native/RaiseHandButton.js b/react/features/reactions/components/native/RaiseHandButton.js
index 344c94cbc8..ba5ea366e3 100644
--- a/react/features/reactions/components/native/RaiseHandButton.js
+++ b/react/features/reactions/components/native/RaiseHandButton.js
@@ -5,19 +5,17 @@ import { Text } from 'react-native-paper';
 import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
-import {
-    createToolbarEvent,
-    sendAnalytics
-} from '../../../analytics';
+import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
 import { RAISE_HAND_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
+import { raiseHand } from '../../../base/participants/actions';
 import {
     getLocalParticipant,
-    hasRaisedHand,
-    raiseHand
-} from '../../../base/participants';
-import { type AbstractButtonProps } from '../../../base/toolbox/components';
+    hasRaisedHand
+} from '../../../base/participants/functions';
+import { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import Button from '../../../base/ui/components/native/Button';
 import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 
diff --git a/react/features/reactions/components/native/ReactionButton.js b/react/features/reactions/components/native/ReactionButton.js
index a9fde05da4..6ee5e0a8b7 100644
--- a/react/features/reactions/components/native/ReactionButton.js
+++ b/react/features/reactions/components/native/ReactionButton.js
@@ -4,9 +4,10 @@ import React, { useCallback } from 'react';
 import { Text, TouchableHighlight } from 'react-native';
 import { useDispatch } from 'react-redux';
 
-import { createReactionMenuEvent, sendAnalytics } from '../../../analytics';
-import { translate } from '../../../base/i18n';
-import type { StyleType } from '../../../base/styles';
+import { createReactionMenuEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
+import { translate } from '../../../base/i18n/functions';
+import { StyleType } from '../../../base/styles/functions.native';
 import { addReactionToBuffer } from '../../actions.any';
 import { REACTIONS } from '../../constants';
 
diff --git a/react/features/reactions/components/native/ReactionMenuDialog.js b/react/features/reactions/components/native/ReactionMenuDialog.js
index 5b4eb469d9..46bd79681c 100644
--- a/react/features/reactions/components/native/ReactionMenuDialog.js
+++ b/react/features/reactions/components/native/ReactionMenuDialog.js
@@ -7,8 +7,8 @@ import { connect } from 'react-redux';
 import ColorSchemeRegistry from '../../../base/color-scheme/ColorSchemeRegistry';
 import { hideDialog } from '../../../base/dialog/actions';
 import { isDialogOpen } from '../../../base/dialog/functions';
-import { getParticipantCount } from '../../../base/participants';
-import type { StyleType } from '../../../base/styles';
+import { getParticipantCount } from '../../../base/participants/functions';
+import { StyleType } from '../../../base/styles/functions.native';
 
 import ReactionMenu from './ReactionMenu';
 
diff --git a/react/features/reactions/components/native/ReactionsMenuButton.js b/react/features/reactions/components/native/ReactionsMenuButton.js
index 069842d78a..aee8adcfaa 100644
--- a/react/features/reactions/components/native/ReactionsMenuButton.js
+++ b/react/features/reactions/components/native/ReactionsMenuButton.js
@@ -7,12 +7,12 @@ import { openDialog } from '../../../base/dialog/actions';
 import { isDialogOpen } from '../../../base/dialog/functions';
 import { RAISE_HAND_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconRaiseHand } from '../../../base/icons';
+import { translate } from '../../../base/i18n/functions';
+import { IconRaiseHand } from '../../../base/icons/svg';
 import {
     getLocalParticipant, hasRaisedHand
-} from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+} from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 import ReactionMenuDialog from './ReactionMenuDialog';
 
diff --git a/react/features/recent-list/components/DeleteItemButton.native.js b/react/features/recent-list/components/DeleteItemButton.native.js
index d070213337..51b0695168 100644
--- a/react/features/recent-list/components/DeleteItemButton.native.js
+++ b/react/features/recent-list/components/DeleteItemButton.native.js
@@ -2,9 +2,9 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { IconTrash } from '../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
+import { translate } from '../../base/i18n/functions';
+import { IconTrash } from '../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../base/toolbox/components/AbstractButton';
 import { deleteRecentListEntry } from '../actions';
 
 export type Props = AbstractButtonProps & {
diff --git a/react/features/recent-list/components/RecentList.native.js b/react/features/recent-list/components/RecentList.native.js
index 1925aad533..2658cfbcca 100644
--- a/react/features/recent-list/components/RecentList.native.js
+++ b/react/features/recent-list/components/RecentList.native.js
@@ -5,7 +5,7 @@ import type { Dispatch } from 'redux';
 
 import { getDefaultURL } from '../../app/functions';
 import { openSheet } from '../../base/dialog/actions';
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { NavigateSectionList, type Section } from '../../base/react';
 import styles from '../../welcome/components/styles';
 import { isRecentListEnabled, toDisplayableList } from '../functions';
diff --git a/react/features/recent-list/components/RecentList.web.js b/react/features/recent-list/components/RecentList.web.js
index a8c05f1c16..c4bf207675 100644
--- a/react/features/recent-list/components/RecentList.web.js
+++ b/react/features/recent-list/components/RecentList.web.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
-import { translate } from '../../base/i18n';
+import { translate } from '../../base/i18n/functions';
 import { MeetingsList } from '../../base/react';
 import { deleteRecentListEntry } from '../actions';
 import { isRecentListEnabled, toDisplayableList } from '../functions';
diff --git a/react/features/recent-list/components/ShowDialInInfoButton.native.js b/react/features/recent-list/components/ShowDialInInfoButton.native.js
index 73d04d8053..f0020f244c 100644
--- a/react/features/recent-list/components/ShowDialInInfoButton.native.js
+++ b/react/features/recent-list/components/ShowDialInInfoButton.native.js
@@ -2,9 +2,9 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { IconInfoCircle } from '../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
+import { translate } from '../../base/i18n/functions';
+import { IconInfoCircle } from '../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../base/toolbox/components/AbstractButton';
 import { navigateRoot } from '../../mobile/navigation/rootNavigationContainerRef';
 import { screen } from '../../mobile/navigation/routes';
 
diff --git a/react/features/recent-list/components/styles.native.js b/react/features/recent-list/components/styles.native.js
index 0b67e19a23..262341ced3 100644
--- a/react/features/recent-list/components/styles.native.js
+++ b/react/features/recent-list/components/styles.native.js
@@ -1,4 +1,5 @@
-import { ColorPalette, createStyleSheet } from '../../base/styles';
+import { ColorPalette } from '../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../base/styles/functions.native';
 
 /**
  * The styles of the React {@code Component}s of the feature recent-list i.e.
diff --git a/react/features/recording/components/LiveStream/_.native.js b/react/features/recording/components/LiveStream/_.native.js
deleted file mode 100644
index a32ec60612..0000000000
--- a/react/features/recording/components/LiveStream/_.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './native';
diff --git a/react/features/recording/components/LiveStream/_.web.js b/react/features/recording/components/LiveStream/_.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/recording/components/LiveStream/_.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/recording/components/LiveStream/index.js b/react/features/recording/components/LiveStream/index.js
deleted file mode 100644
index bf0c7deb0e..0000000000
--- a/react/features/recording/components/LiveStream/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './_';
diff --git a/react/features/recording/components/LiveStream/native/GoogleSigninForm.js b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js
index 1b6639f1d2..a027e4757a 100644
--- a/react/features/recording/components/LiveStream/native/GoogleSigninForm.js
+++ b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js
@@ -5,15 +5,15 @@ import { Text, View } from 'react-native';
 import { connect } from 'react-redux';
 
 import { _abstractMapStateToProps } from '../../../../base/dialog/functions';
-import { translate } from '../../../../base/i18n';
-import { StyleType } from '../../../../base/styles';
+import { translate } from '../../../../base/i18n/functions';
+import { StyleType } from '../../../../base/styles/functions.native';
+import { setGoogleAPIState } from '../../../../google-api/actions';
+import GoogleSignInButton from '../../../../google-api/components/GoogleSignInButton.native';
 import {
     GOOGLE_API_STATES,
-    GOOGLE_SCOPE_YOUTUBE,
-    GoogleSignInButton,
-    googleApi,
-    setGoogleAPIState
-} from '../../../../google-api';
+    GOOGLE_SCOPE_YOUTUBE
+} from '../../../../google-api/constants';
+import googleApi from '../../../../google-api/googleApi.native';
 import logger from '../../../logger';
 
 import styles from './styles';
diff --git a/react/features/recording/components/LiveStream/native/LiveStreamButton.js b/react/features/recording/components/LiveStream/native/LiveStreamButton.js
index f83e919339..5bc78ac0a6 100644
--- a/react/features/recording/components/LiveStream/native/LiveStreamButton.js
+++ b/react/features/recording/components/LiveStream/native/LiveStreamButton.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { openDialog } from '../../../../base/dialog/actions';
 import { LIVE_STREAMING_ENABLED } from '../../../../base/flags/constants';
 import { getFeatureFlag } from '../../../../base/flags/functions';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import { navigate }
     from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../../mobile/navigation/routes';
@@ -13,7 +13,7 @@ import AbstractLiveStreamButton,
 { _mapStateToProps as _abstractMapStateToProps } from '../AbstractLiveStreamButton';
 import type { Props } from '../AbstractStartLiveStreamDialog';
 
-import { StopLiveStreamDialog } from './index';
+import StopLiveStreamDialog from './StopLiveStreamDialog';
 
 
 /**
diff --git a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js
index 329ba55750..d932dc7e06 100644
--- a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js
+++ b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js
@@ -3,9 +3,9 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
-import { googleApi } from '../../../../google-api';
+import googleApi from '../../../../google-api/googleApi.native';
 import HeaderNavigationButton
     from '../../../../mobile/navigation/components/HeaderNavigationButton';
 import { goBack }
diff --git a/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js b/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js
index fa4dd1beb1..2e9952e7e9 100644
--- a/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js
+++ b/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import AbstractStopLiveStreamDialog, {
     _mapStateToProps
 } from '../AbstractStopLiveStreamDialog';
diff --git a/react/features/recording/components/LiveStream/native/StreamKeyForm.js b/react/features/recording/components/LiveStream/native/StreamKeyForm.js
index 465deea977..696708f0cc 100644
--- a/react/features/recording/components/LiveStream/native/StreamKeyForm.js
+++ b/react/features/recording/components/LiveStream/native/StreamKeyForm.js
@@ -3,8 +3,8 @@ import { Linking, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 
 import { _abstractMapStateToProps } from '../../../../base/dialog/functions';
-import { translate } from '../../../../base/i18n';
-import { StyleType } from '../../../../base/styles';
+import { translate } from '../../../../base/i18n/functions';
+import { StyleType } from '../../../../base/styles/functions.native';
 import Button from '../../../../base/ui/components/native/Button';
 import Input from '../../../../base/ui/components/native/Input';
 import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
diff --git a/react/features/recording/components/LiveStream/native/StreamKeyPicker.js b/react/features/recording/components/LiveStream/native/StreamKeyPicker.js
index f189e7a9cb..125ce907ba 100644
--- a/react/features/recording/components/LiveStream/native/StreamKeyPicker.js
+++ b/react/features/recording/components/LiveStream/native/StreamKeyPicker.js
@@ -11,8 +11,8 @@ import {
 import { connect } from 'react-redux';
 
 import { _abstractMapStateToProps } from '../../../../base/dialog/functions';
-import { translate } from '../../../../base/i18n';
-import { StyleType } from '../../../../base/styles';
+import { translate } from '../../../../base/i18n/functions';
+import { StyleType } from '../../../../base/styles/functions.native';
 import { YOUTUBE_LIVE_DASHBOARD_URL } from '../constants';
 
 import styles, { ACTIVE_OPACITY, TOUCHABLE_UNDERLAY } from './styles';
diff --git a/react/features/recording/components/LiveStream/native/index.js b/react/features/recording/components/LiveStream/native/index.js
deleted file mode 100644
index fa574bac74..0000000000
--- a/react/features/recording/components/LiveStream/native/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export { default as LiveStreamButton } from './LiveStreamButton';
-export { default as StartLiveStreamDialog } from './StartLiveStreamDialog';
-export { default as StopLiveStreamDialog } from './StopLiveStreamDialog';
diff --git a/react/features/recording/components/LiveStream/native/styles.js b/react/features/recording/components/LiveStream/native/styles.js
index 64f713e06f..198c7feb0e 100644
--- a/react/features/recording/components/LiveStream/native/styles.js
+++ b/react/features/recording/components/LiveStream/native/styles.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { createStyleSheet } from '../../../../base/styles';
+import { createStyleSheet } from '../../../../base/styles/functions.native';
 import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
 
 /**
diff --git a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.tsx b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.tsx
index 5a0f6fab4e..6b910a9782 100644
--- a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.tsx
+++ b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.tsx
@@ -6,8 +6,6 @@ import { translate } from '../../../../base/i18n/functions';
 import Dialog from '../../../../base/ui/components/web/Dialog';
 import Spinner from '../../../../base/ui/components/web/Spinner';
 import {
-    GOOGLE_API_STATES,
-    GoogleSignInButton,
     loadGoogleAPI,
     requestAvailableYouTubeBroadcasts,
     requestLiveStreamsForYouTubeBroadcast,
@@ -16,7 +14,15 @@ import {
     updateProfile
 
     // @ts-ignore
-} from '../../../../google-api';
+} from '../../../../google-api/actions';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
+import GoogleSignInButton from '../../../../google-api/components/GoogleSignInButton.web';
+import {
+    GOOGLE_API_STATES
+
+    // @ts-ignore
+} from '../../../../google-api/constants';
 import AbstractStartLiveStreamDialog, {
     IProps as AbstractProps,
     _mapStateToProps as _abstractMapStateToProps
diff --git a/react/features/recording/components/LiveStream/web/index.js b/react/features/recording/components/LiveStream/web/index.js
deleted file mode 100644
index fa574bac74..0000000000
--- a/react/features/recording/components/LiveStream/web/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export { default as LiveStreamButton } from './LiveStreamButton';
-export { default as StartLiveStreamDialog } from './StartLiveStreamDialog';
-export { default as StopLiveStreamDialog } from './StopLiveStreamDialog';
diff --git a/react/features/recording/components/Recording/AbstractHighlightButton.ts b/react/features/recording/components/Recording/AbstractHighlightButton.ts
index 69911400f6..5cd02d60b6 100644
--- a/react/features/recording/components/Recording/AbstractHighlightButton.ts
+++ b/react/features/recording/components/Recording/AbstractHighlightButton.ts
@@ -11,10 +11,11 @@ import { NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE } from '../../../notificat
 import { highlightMeetingMoment } from '../../actions.any';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
-import { StartRecordingDialog } from '../../components';
 import { PROMPT_RECORDING_NOTIFICATION_ID } from '../../constants';
 import { getActiveSession, getRecordButtonProps, isHighlightMeetingMomentDisabled } from '../../functions';
 
+import { StartRecordingDialog } from './index';
+
 export interface IProps extends WithTranslation {
 
     /**
diff --git a/react/features/recording/components/Recording/AbstractStartRecordingDialogContent.tsx b/react/features/recording/components/Recording/AbstractStartRecordingDialogContent.tsx
index 813a596e16..ede86be9d0 100644
--- a/react/features/recording/components/Recording/AbstractStartRecordingDialogContent.tsx
+++ b/react/features/recording/components/Recording/AbstractStartRecordingDialogContent.tsx
@@ -7,8 +7,6 @@ import { sendAnalytics } from '../../../analytics/functions';
 import { IReduxState } from '../../../app/types';
 import ColorSchemeRegistry from '../../../base/color-scheme/ColorSchemeRegistry';
 import { _abstractMapStateToProps } from '../../../base/dialog/functions';
-// @ts-ignore
-import { StyleType } from '../../../base/styles';
 import { authorizeDropbox, updateDropboxToken } from '../../../dropbox/actions';
 import { isVpaasMeeting } from '../../../jaas/functions';
 import { RECORDING_TYPES } from '../../constants';
@@ -23,7 +21,7 @@ export interface IProps extends WithTranslation {
     /**
      * Style of the dialogs feature.
      */
-    _dialogStyles: StyleType;
+    _dialogStyles: any;
 
     /**
      * Whether to hide the storage warning or not.
@@ -53,7 +51,7 @@ export interface IProps extends WithTranslation {
     /**
      * The color-schemed stylesheet of this component.
      */
-    _styles: StyleType;
+    _styles: any;
 
     /**
      * The redux dispatch function.
diff --git a/react/features/recording/components/Recording/_.native.js b/react/features/recording/components/Recording/_.native.js
deleted file mode 100644
index a32ec60612..0000000000
--- a/react/features/recording/components/Recording/_.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './native';
diff --git a/react/features/recording/components/Recording/_.web.js b/react/features/recording/components/Recording/_.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/recording/components/Recording/_.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/recording/components/Recording/index.js b/react/features/recording/components/Recording/index.js
deleted file mode 100644
index bf0c7deb0e..0000000000
--- a/react/features/recording/components/Recording/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './_';
diff --git a/react/features/recording/components/Recording/index.native.ts b/react/features/recording/components/Recording/index.native.ts
new file mode 100644
index 0000000000..d51e121d77
--- /dev/null
+++ b/react/features/recording/components/Recording/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as StartRecordingDialog } from './native/StartRecordingDialog';
diff --git a/react/features/recording/components/Recording/index.web.ts b/react/features/recording/components/Recording/index.web.ts
new file mode 100644
index 0000000000..a65408d556
--- /dev/null
+++ b/react/features/recording/components/Recording/index.web.ts
@@ -0,0 +1 @@
+export { default as StartRecordingDialog } from './web/StartRecordingDialog';
diff --git a/react/features/recording/components/Recording/native/HighlightButton.js b/react/features/recording/components/Recording/native/HighlightButton.js
index 704cedd231..f66af161df 100644
--- a/react/features/recording/components/Recording/native/HighlightButton.js
+++ b/react/features/recording/components/Recording/native/HighlightButton.js
@@ -4,9 +4,9 @@ import React from 'react';
 import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
-import { translate } from '../../../../base/i18n';
-import { IconHighlight } from '../../../../base/icons';
-import { Label } from '../../../../base/label';
+import { translate } from '../../../../base/i18n/functions';
+import { IconHighlight } from '../../../../base/icons/svg';
+import Label from '../../../../base/label/components/native/Label';
 import BaseTheme from '../../../../base/ui/components/BaseTheme';
 import AbstractHighlightButton, {
     type Props as AbstractProps,
diff --git a/react/features/recording/components/Recording/native/RecordButton.js b/react/features/recording/components/Recording/native/RecordButton.js
index 51e2e585c5..f402417cb6 100644
--- a/react/features/recording/components/Recording/native/RecordButton.js
+++ b/react/features/recording/components/Recording/native/RecordButton.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { openDialog } from '../../../../base/dialog/actions';
 import { IOS_RECORDING_ENABLED, RECORDING_ENABLED } from '../../../../base/flags/constants';
 import { getFeatureFlag } from '../../../../base/flags/functions';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import { navigate }
     from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../../mobile/navigation/routes';
@@ -14,7 +14,7 @@ import type { Props } from '../../LiveStream/AbstractStartLiveStreamDialog';
 import AbstractRecordButton,
 { _mapStateToProps as _abstractMapStateToProps } from '../AbstractRecordButton';
 
-import { StopRecordingDialog } from './index';
+import StopRecordingDialog from './StopRecordingDialog';
 
 
 /**
diff --git a/react/features/recording/components/Recording/native/StartRecordingDialog.js b/react/features/recording/components/Recording/native/StartRecordingDialog.js
index c2fa60119f..985a8b2853 100644
--- a/react/features/recording/components/Recording/native/StartRecordingDialog.js
+++ b/react/features/recording/components/Recording/native/StartRecordingDialog.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
 import HeaderNavigationButton
     from '../../../../mobile/navigation/components/HeaderNavigationButton';
diff --git a/react/features/recording/components/Recording/native/StopRecordingDialog.js b/react/features/recording/components/Recording/native/StopRecordingDialog.js
index 2d799cd4d9..5961fa90ef 100644
--- a/react/features/recording/components/Recording/native/StopRecordingDialog.js
+++ b/react/features/recording/components/Recording/native/StopRecordingDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import AbstractStopRecordingDialog, {
     type Props,
     _mapStateToProps
diff --git a/react/features/recording/components/Recording/native/index.js b/react/features/recording/components/Recording/native/index.js
deleted file mode 100644
index 6ea3245143..0000000000
--- a/react/features/recording/components/Recording/native/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export { default as HighlightButton } from './HighlightButton';
-export { default as RecordButton } from './RecordButton';
-export { default as StartRecordingDialog } from './StartRecordingDialog';
-export { default as StopRecordingDialog } from './StopRecordingDialog';
diff --git a/react/features/recording/components/Recording/styles.native.js b/react/features/recording/components/Recording/styles.native.js
index 060bfcfd9f..8a5eb6b87f 100644
--- a/react/features/recording/components/Recording/styles.native.js
+++ b/react/features/recording/components/Recording/styles.native.js
@@ -2,7 +2,7 @@
 
 import ColorSchemeRegistry from '../../../base/color-scheme/ColorSchemeRegistry';
 import { schemeColor } from '../../../base/color-scheme/functions';
-import { BoxModel } from '../../../base/styles';
+import { BoxModel } from '../../../base/styles/components/styles/BoxModel';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 export const DROPBOX_LOGO = require('../../../../../images/dropboxLogo_square.png');
diff --git a/react/features/recording/components/Recording/web/index.js b/react/features/recording/components/Recording/web/index.js
deleted file mode 100644
index 6ea3245143..0000000000
--- a/react/features/recording/components/Recording/web/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export { default as HighlightButton } from './HighlightButton';
-export { default as RecordButton } from './RecordButton';
-export { default as StartRecordingDialog } from './StartRecordingDialog';
-export { default as StopRecordingDialog } from './StopRecordingDialog';
diff --git a/react/features/recording/components/_.native.js b/react/features/recording/components/_.native.js
deleted file mode 100644
index a32ec60612..0000000000
--- a/react/features/recording/components/_.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './native';
diff --git a/react/features/recording/components/_.web.js b/react/features/recording/components/_.web.js
deleted file mode 100644
index 40d5f46528..0000000000
--- a/react/features/recording/components/_.web.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export * from './web';
diff --git a/react/features/recording/components/index.js b/react/features/recording/components/index.js
deleted file mode 100644
index 8006c16995..0000000000
--- a/react/features/recording/components/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export * from './_';
-export * from './LiveStream';
-export * from './Recording';
diff --git a/react/features/recording/components/native/RecordingExpandedLabel.js b/react/features/recording/components/native/RecordingExpandedLabel.js
index bbef65b699..23b5649647 100644
--- a/react/features/recording/components/native/RecordingExpandedLabel.js
+++ b/react/features/recording/components/native/RecordingExpandedLabel.js
@@ -2,11 +2,8 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import {
-    type Props as AbstractProps,
-    ExpandedLabel
-} from '../../../base/label';
+import { translate } from '../../../base/i18n/functions';
+import ExpandedLabel, { Props as AbstractProps } from '../../../base/label/components/native/ExpandedLabel';
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import { getSessionStatusToShow } from '../../functions';
 
diff --git a/react/features/recording/components/native/RecordingLabel.js b/react/features/recording/components/native/RecordingLabel.js
index c1e4c97190..90cc9e22e7 100644
--- a/react/features/recording/components/native/RecordingLabel.js
+++ b/react/features/recording/components/native/RecordingLabel.js
@@ -3,8 +3,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { Label } from '../../../base/label';
+import { translate } from '../../../base/i18n/functions';
+import Label from '../../../base/label/components/native/Label';
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import AbstractRecordingLabel, {
     _mapStateToProps
diff --git a/react/features/recording/components/native/index.js b/react/features/recording/components/native/index.js
deleted file mode 100644
index 7c3fda4667..0000000000
--- a/react/features/recording/components/native/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export { default as RecordingExpandedLabel } from './RecordingExpandedLabel';
-export { default as RecordingLabel } from './RecordingLabel';
diff --git a/react/features/recording/components/native/styles.js b/react/features/recording/components/native/styles.js
index 57c1331032..8438274822 100644
--- a/react/features/recording/components/native/styles.js
+++ b/react/features/recording/components/native/styles.js
@@ -1,6 +1,6 @@
 // @flow
 
-import { createStyleSheet } from '../../../base/styles';
+import { createStyleSheet } from '../../../base/styles/functions.native';
 import BaseTheme from '../../../base/ui/components/BaseTheme';
 
 /**
diff --git a/react/features/recording/components/web/index.js b/react/features/recording/components/web/index.js
deleted file mode 100644
index df93a236a4..0000000000
--- a/react/features/recording/components/web/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export { default as RecordingLabel } from './RecordingLabel';
-export { default as RecordingLimitNotificationDescription } from './RecordingLimitNotificationDescription';
diff --git a/react/features/remote-control/actions.ts b/react/features/remote-control/actions.ts
index 498919b847..8a9e2f37ba 100644
--- a/react/features/remote-control/actions.ts
+++ b/react/features/remote-control/actions.ts
@@ -28,7 +28,7 @@ import {
 } from './actionTypes';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
-import { RemoteControlAuthorizationDialog } from './components';
+import RemoteControlAuthorizationDialog from './components/RemoteControlAuthorizationDialog';
 import {
     DISCO_REMOTE_CONTROL_FEATURE,
     EVENTS,
diff --git a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js b/react/features/remote-control/components/RemoteControlAuthorizationDialog.js
index dfe7d81c89..a304cc224b 100644
--- a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js
+++ b/react/features/remote-control/components/RemoteControlAuthorizationDialog.js
@@ -3,9 +3,9 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { getParticipantById } from '../../base/participants';
-import { getLocalVideoTrack } from '../../base/tracks';
+import { translate } from '../../base/i18n/functions';
+import { getParticipantById } from '../../base/participants/functions';
+import { getLocalVideoTrack } from '../../base/tracks/functions.any';
 import Dialog from '../../base/ui/components/web/Dialog';
 import { deny, grant } from '../actions';
 
diff --git a/react/features/remote-control/components/index.js b/react/features/remote-control/components/index.js
deleted file mode 100644
index f0efa09683..0000000000
--- a/react/features/remote-control/components/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as RemoteControlAuthorizationDialog }
-    from './RemoteControlAuthorizationDialog';
diff --git a/react/features/remote-control/index.js b/react/features/remote-control/index.js
deleted file mode 100644
index 3c46ed49d1..0000000000
--- a/react/features/remote-control/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './actions';
-export * from './components';
diff --git a/react/features/salesforce/components/_.native.js b/react/features/salesforce/components/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/salesforce/components/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/salesforce/components/_.web.js b/react/features/salesforce/components/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/salesforce/components/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/salesforce/components/index.js b/react/features/salesforce/components/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/salesforce/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/salesforce/components/index.native.ts b/react/features/salesforce/components/index.native.ts
new file mode 100644
index 0000000000..f3783af28f
--- /dev/null
+++ b/react/features/salesforce/components/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as SalesforceLinkDialog } from './native/SalesforceLinkDialog';
diff --git a/react/features/salesforce/components/index.web.ts b/react/features/salesforce/components/index.web.ts
new file mode 100644
index 0000000000..d144b9be30
--- /dev/null
+++ b/react/features/salesforce/components/index.web.ts
@@ -0,0 +1 @@
+export { default as SalesforceLinkDialog } from './web/SalesforceLinkDialog';
diff --git a/react/features/salesforce/components/native/RecordItem.js b/react/features/salesforce/components/native/RecordItem.js
index 7dad2494cd..af4abf4942 100644
--- a/react/features/salesforce/components/native/RecordItem.js
+++ b/react/features/salesforce/components/native/RecordItem.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Text, TouchableHighlight, View } from 'react-native';
 
-import { Icon } from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
 import { RECORD_TYPE } from '../../constants';
 
 import styles from './styles';
diff --git a/react/features/salesforce/components/native/SalesforceLinkDialog.js b/react/features/salesforce/components/native/SalesforceLinkDialog.js
index e3bfaf21d2..0f17a6fb8b 100644
--- a/react/features/salesforce/components/native/SalesforceLinkDialog.js
+++ b/react/features/salesforce/components/native/SalesforceLinkDialog.js
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Platform, SafeAreaView, ScrollView, Text, View } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { IconSearch } from '../../../base/icons';
+import { IconSearch } from '../../../base/icons/svg';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { LoadingIndicator } from '../../../base/react';
 import Button from '../../../base/ui/components/native/Button';
diff --git a/react/features/salesforce/components/native/index.js b/react/features/salesforce/components/native/index.js
deleted file mode 100644
index 6a7e3dac09..0000000000
--- a/react/features/salesforce/components/native/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SalesforceLinkDialog } from './SalesforceLinkDialog';
diff --git a/react/features/salesforce/components/web/index.js b/react/features/salesforce/components/web/index.js
deleted file mode 100644
index 6a7e3dac09..0000000000
--- a/react/features/salesforce/components/web/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SalesforceLinkDialog } from './SalesforceLinkDialog';
diff --git a/react/features/security/components/security-dialog/_.native.js b/react/features/security/components/security-dialog/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/security/components/security-dialog/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/security/components/security-dialog/_.web.js b/react/features/security/components/security-dialog/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/security/components/security-dialog/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/security/components/security-dialog/index.js b/react/features/security/components/security-dialog/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/security/components/security-dialog/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/security/components/security-dialog/index.native.ts b/react/features/security/components/security-dialog/index.native.ts
new file mode 100644
index 0000000000..2daee70de3
--- /dev/null
+++ b/react/features/security/components/security-dialog/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as SecurityDialog } from './native/SecurityDialog';
diff --git a/react/features/security/components/security-dialog/index.web.ts b/react/features/security/components/security-dialog/index.web.ts
new file mode 100644
index 0000000000..da7e62ce7d
--- /dev/null
+++ b/react/features/security/components/security-dialog/index.web.ts
@@ -0,0 +1 @@
+export { default as SecurityDialog } from './web/SecurityDialog';
diff --git a/react/features/security/components/security-dialog/native/SecurityDialog.js b/react/features/security/components/security-dialog/native/SecurityDialog.js
index 3611572eb6..2edce6d935 100644
--- a/react/features/security/components/security-dialog/native/SecurityDialog.js
+++ b/react/features/security/components/security-dialog/native/SecurityDialog.js
@@ -9,9 +9,9 @@ import type { Dispatch } from 'redux';
 import { getSecurityUiConfig } from '../../../../base/config/functions.any';
 import { MEETING_PASSWORD_ENABLED } from '../../../../base/flags/constants';
 import { getFeatureFlag } from '../../../../base/flags/functions';
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
-import { isLocalParticipantModerator } from '../../../../base/participants';
+import { isLocalParticipantModerator } from '../../../../base/participants/functions';
 import Button from '../../../../base/ui/components/native/Button';
 import Input from '../../../../base/ui/components/native/Input';
 import Switch from '../../../../base/ui/components/native/Switch';
diff --git a/react/features/security/components/security-dialog/native/SecurityDialogButton.js b/react/features/security/components/security-dialog/native/SecurityDialogButton.js
index 6672f006a8..382317ff6c 100644
--- a/react/features/security/components/security-dialog/native/SecurityDialogButton.js
+++ b/react/features/security/components/security-dialog/native/SecurityDialogButton.js
@@ -2,7 +2,7 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../../base/i18n';
+import { translate } from '../../../../base/i18n/functions';
 import { navigate } from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../../mobile/navigation/routes';
 import AbstractSecurityDialogButton, {
diff --git a/react/features/security/components/security-dialog/native/index.js b/react/features/security/components/security-dialog/native/index.js
deleted file mode 100644
index b47a0d2f38..0000000000
--- a/react/features/security/components/security-dialog/native/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-
-export { default as SecurityDialog } from './SecurityDialog';
-
diff --git a/react/features/security/components/security-dialog/web/index.js b/react/features/security/components/security-dialog/web/index.js
deleted file mode 100644
index 08ec6fb206..0000000000
--- a/react/features/security/components/security-dialog/web/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-
-export { default as SecurityDialog } from './SecurityDialog';
diff --git a/react/features/settings/components/native/FormRow.js b/react/features/settings/components/native/FormRow.js
index a91c4d5d5f..0ccdfcde98 100644
--- a/react/features/settings/components/native/FormRow.js
+++ b/react/features/settings/components/native/FormRow.js
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 
 import styles, { ANDROID_UNDERLINE_COLOR, PLACEHOLDER_COLOR } from './styles';
 
diff --git a/react/features/shared-video/components/_.native.js b/react/features/shared-video/components/_.native.js
deleted file mode 100644
index 738c4d2b8a..0000000000
--- a/react/features/shared-video/components/_.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './native';
diff --git a/react/features/shared-video/components/_.web.js b/react/features/shared-video/components/_.web.js
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/shared-video/components/_.web.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/shared-video/components/index.js b/react/features/shared-video/components/index.js
deleted file mode 100644
index cda61441e4..0000000000
--- a/react/features/shared-video/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './_';
diff --git a/react/features/shared-video/components/index.native.ts b/react/features/shared-video/components/index.native.ts
new file mode 100644
index 0000000000..9de9793a8b
--- /dev/null
+++ b/react/features/shared-video/components/index.native.ts
@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as SharedVideoDialog } from './native/SharedVideoDialog';
diff --git a/react/features/shared-video/components/index.web.ts b/react/features/shared-video/components/index.web.ts
new file mode 100644
index 0000000000..81c559db00
--- /dev/null
+++ b/react/features/shared-video/components/index.web.ts
@@ -0,0 +1 @@
+export { default as SharedVideoDialog } from './web/SharedVideoDialog';
diff --git a/react/features/shared-video/components/native/SharedVideo.js b/react/features/shared-video/components/native/SharedVideo.js
index 8c69ebd9c6..4c3faa63de 100644
--- a/react/features/shared-video/components/native/SharedVideo.js
+++ b/react/features/shared-video/components/native/SharedVideo.js
@@ -4,8 +4,8 @@ import React, { Component } from 'react';
 import { View } from 'react-native';
 import { connect } from 'react-redux';
 
-import { getLocalParticipant } from '../../../base/participants';
-import { ASPECT_RATIO_WIDE } from '../../../base/responsive-ui';
+import { getLocalParticipant } from '../../../base/participants/functions';
+import { ASPECT_RATIO_WIDE } from '../../../base/responsive-ui/constants';
 import { setToolboxVisible } from '../../../toolbox/actions';
 
 import VideoManager from './VideoManager';
diff --git a/react/features/shared-video/components/native/SharedVideoButton.js b/react/features/shared-video/components/native/SharedVideoButton.js
index c45be65a3d..9a0c2ba7f3 100644
--- a/react/features/shared-video/components/native/SharedVideoButton.js
+++ b/react/features/shared-video/components/native/SharedVideoButton.js
@@ -5,10 +5,10 @@ import type { Dispatch } from 'redux';
 
 import { VIDEO_SHARE_BUTTON_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconPlay } from '../../../base/icons';
-import { getLocalParticipant } from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconPlay } from '../../../base/icons/svg';
+import { getLocalParticipant } from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { toggleSharedVideo } from '../../actions.native';
 import { isSharingStatus } from '../../functions';
 
diff --git a/react/features/shared-video/components/native/SharedVideoDialog.js b/react/features/shared-video/components/native/SharedVideoDialog.js
index ecd55d363e..1478cfeece 100644
--- a/react/features/shared-video/components/native/SharedVideoDialog.js
+++ b/react/features/shared-video/components/native/SharedVideoDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import InputDialog from '../../../base/dialog/components/native/InputDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractSharedVideoDialog from '../AbstractSharedVideoDialog';
 
 /**
diff --git a/react/features/shared-video/components/native/index.js b/react/features/shared-video/components/native/index.js
deleted file mode 100644
index 993ca2d8d4..0000000000
--- a/react/features/shared-video/components/native/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @flow
-
-export { default as SharedVideoButton } from './SharedVideoButton';
-export { default as SharedVideoDialog } from './SharedVideoDialog';
-export { default as SharedVideo } from './SharedVideo';
-
diff --git a/react/features/shared-video/components/web/SharedVideo.js b/react/features/shared-video/components/web/SharedVideo.js
index 591d8b1b4f..cad755789f 100644
--- a/react/features/shared-video/components/web/SharedVideo.js
+++ b/react/features/shared-video/components/web/SharedVideo.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import Filmstrip from '../../../../../modules/UI/videolayout/Filmstrip';
-import { getLocalParticipant } from '../../../base/participants';
+import { getLocalParticipant } from '../../../base/participants/functions';
 import { getVerticalViewMaxWidth } from '../../../filmstrip/functions.web';
 import { getToolboxHeight } from '../../../toolbox/functions.web';
 
diff --git a/react/features/shared-video/components/web/index.js b/react/features/shared-video/components/web/index.js
deleted file mode 100644
index 75ffda0d05..0000000000
--- a/react/features/shared-video/components/web/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export { default as SharedVideo } from './SharedVideo';
-export { default as SharedVideoButton } from './SharedVideoButton';
-export { default as SharedVideoDialog } from './SharedVideoDialog';
diff --git a/react/features/speaker-stats/components/_.native.ts b/react/features/speaker-stats/components/_.native.ts
deleted file mode 100644
index 88a7473256..0000000000
--- a/react/features/speaker-stats/components/_.native.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @ts-ignore
-export * from './native';
diff --git a/react/features/speaker-stats/components/_.web.ts b/react/features/speaker-stats/components/_.web.ts
deleted file mode 100644
index b80c83af34..0000000000
--- a/react/features/speaker-stats/components/_.web.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './web';
diff --git a/react/features/speaker-stats/components/index.ts b/react/features/speaker-stats/components/index.ts
deleted file mode 100644
index 796480f8ed..0000000000
--- a/react/features/speaker-stats/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @ts-ignore
-export * from './_';
diff --git a/react/features/speaker-stats/components/native/SpeakerStatsButton.js b/react/features/speaker-stats/components/native/SpeakerStatsButton.js
index 741cd2d8d1..72e2468c04 100644
--- a/react/features/speaker-stats/components/native/SpeakerStatsButton.js
+++ b/react/features/speaker-stats/components/native/SpeakerStatsButton.js
@@ -2,10 +2,11 @@
 
 import { connect } from 'react-redux';
 
-import { createToolbarEvent, sendAnalytics } from '../../../analytics';
+import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
 import { SPEAKERSTATS_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 import AbstractSpeakerStatsButton from '../AbstractSpeakerStatsButton';
diff --git a/react/features/speaker-stats/components/native/SpeakerStatsSearch.js b/react/features/speaker-stats/components/native/SpeakerStatsSearch.js
index 0c7a93d8b4..2903207eb3 100644
--- a/react/features/speaker-stats/components/native/SpeakerStatsSearch.js
+++ b/react/features/speaker-stats/components/native/SpeakerStatsSearch.js
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next';
 import { withTheme } from 'react-native-paper';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { IconSearch } from '../../../base/icons';
+import { IconSearch } from '../../../base/icons/svg';
 import Input from '../../../base/ui/components/native/Input';
-import { escapeRegexp } from '../../../base/util';
+import { escapeRegexp } from '../../../base/util/helpers';
 import { initSearch } from '../../actions';
 import { isSpeakerStatsSearchDisabled } from '../../functions';
 
diff --git a/react/features/speaker-stats/components/native/TimeElapsed.js b/react/features/speaker-stats/components/native/TimeElapsed.js
index 94d23ca991..217da71e81 100644
--- a/react/features/speaker-stats/components/native/TimeElapsed.js
+++ b/react/features/speaker-stats/components/native/TimeElapsed.js
@@ -3,7 +3,7 @@
 import React, { PureComponent } from 'react';
 import { Text } from 'react-native';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import { createLocalizedTime } from '../timeFunctions';
 
 /**
diff --git a/react/features/speaker-stats/components/native/index.js b/react/features/speaker-stats/components/native/index.js
deleted file mode 100644
index c414a42507..0000000000
--- a/react/features/speaker-stats/components/native/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// @flow
-export { default as SpeakerStatsButton } from './SpeakerStatsButton';
-export { default as SpeakerStats } from './SpeakerStats';
-
diff --git a/react/features/speaker-stats/components/web/index.ts b/react/features/speaker-stats/components/web/index.ts
deleted file mode 100644
index 7787e1711c..0000000000
--- a/react/features/speaker-stats/components/web/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as SpeakerStatsButton } from './SpeakerStatsButton';
-export { default as SpeakerStats } from './SpeakerStats';
diff --git a/react/features/speaker-stats/index.ts b/react/features/speaker-stats/index.ts
deleted file mode 100644
index 07635cbbc8..0000000000
--- a/react/features/speaker-stats/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components';
diff --git a/react/features/stream-effects/audio-mixer/AudioMixerEffect.js b/react/features/stream-effects/audio-mixer/AudioMixerEffect.js
index 914b4c6d3a..fc43c47006 100644
--- a/react/features/stream-effects/audio-mixer/AudioMixerEffect.js
+++ b/react/features/stream-effects/audio-mixer/AudioMixerEffect.js
@@ -1,7 +1,7 @@
 // @flow
 
 import JitsiMeetJS from '../../base/lib-jitsi-meet';
-import { MEDIA_TYPE } from '../../base/media';
+import { MEDIA_TYPE } from '../../base/media/constants';
 
 /**
  * Class Implementing the effect interface expected by a JitsiLocalTrack.
diff --git a/react/features/subtitles/components/Captions.web.js b/react/features/subtitles/components/Captions.web.js
index e79019b807..9d0ae5c5c1 100644
--- a/react/features/subtitles/components/Captions.web.js
+++ b/react/features/subtitles/components/Captions.web.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { getLocalParticipant } from '../../base/participants';
+import { getLocalParticipant } from '../../base/participants/functions';
 import { getLargeVideoParticipant } from '../../large-video/functions';
 import { isLayoutTileView } from '../../video-layout/functions.web';
 
diff --git a/react/features/subtitles/components/ClosedCaptionButton.native.js b/react/features/subtitles/components/ClosedCaptionButton.native.js
index a4c08daada..3b093d0b6d 100644
--- a/react/features/subtitles/components/ClosedCaptionButton.native.js
+++ b/react/features/subtitles/components/ClosedCaptionButton.native.js
@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 
 import { CLOSE_CAPTIONS_ENABLED } from '../../base/flags/constants';
 import { getFeatureFlag } from '../../base/flags/functions';
-import { translate } from '../../base/i18n';
-import { IconSubtitles } from '../../base/icons';
+import { translate } from '../../base/i18n/functions';
+import { IconSubtitles } from '../../base/icons/svg';
 
 import {
     AbstractClosedCaptionButton,
diff --git a/react/features/subtitles/components/styles.js b/react/features/subtitles/components/styles.js
index 7ab97a7ae0..b889f3561e 100644
--- a/react/features/subtitles/components/styles.js
+++ b/react/features/subtitles/components/styles.js
@@ -1,6 +1,8 @@
 // @flow
 
-import { BoxModel, ColorPalette, createStyleSheet } from '../../base/styles';
+import { BoxModel } from '../../base/styles/components/styles/BoxModel';
+import { ColorPalette } from '../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../base/styles/functions.any';
 
 /**
  * The styles of the React {@code Component}s of the feature subtitles.
diff --git a/react/features/toolbox/components/native/AudioOnlyButton.js b/react/features/toolbox/components/native/AudioOnlyButton.js
index c586d9f13d..c93a69603d 100644
--- a/react/features/toolbox/components/native/AudioOnlyButton.js
+++ b/react/features/toolbox/components/native/AudioOnlyButton.js
@@ -5,9 +5,9 @@ import { connect } from 'react-redux';
 import { setAudioOnly, toggleAudioOnly } from '../../../base/audio-only/actions';
 import { AUDIO_ONLY_BUTTON_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconAudioOnly, IconAudioOnlyOff } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconAudioOnly, IconAudioOnlyOff } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import {
     navigate
 } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
diff --git a/react/features/toolbox/components/native/LinkToSalesforceButton.js b/react/features/toolbox/components/native/LinkToSalesforceButton.js
index 8c20617d91..18576f4872 100644
--- a/react/features/toolbox/components/native/LinkToSalesforceButton.js
+++ b/react/features/toolbox/components/native/LinkToSalesforceButton.js
@@ -2,10 +2,11 @@
 
 import { connect } from 'react-redux';
 
-import { createToolbarEvent, sendAnalytics } from '../../../analytics';
-import { translate } from '../../../base/i18n';
-import { IconCloudUpload } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
+import { translate } from '../../../base/i18n/functions';
+import { IconCloudUpload } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { navigate }
     from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
diff --git a/react/features/toolbox/components/native/OverflowMenuButton.js b/react/features/toolbox/components/native/OverflowMenuButton.js
index 99d0ae7fb1..81121e8375 100644
--- a/react/features/toolbox/components/native/OverflowMenuButton.js
+++ b/react/features/toolbox/components/native/OverflowMenuButton.js
@@ -3,9 +3,9 @@ import { connect } from 'react-redux';
 import { openSheet } from '../../../base/dialog/actions';
 import { OVERFLOW_MENU_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconDotsHorizontal } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconDotsHorizontal } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 import OverflowMenu from './OverflowMenu';
 
diff --git a/react/features/toolbox/components/native/RaiseHandButton.js b/react/features/toolbox/components/native/RaiseHandButton.js
index a41c222d45..7922061648 100644
--- a/react/features/toolbox/components/native/RaiseHandButton.js
+++ b/react/features/toolbox/components/native/RaiseHandButton.js
@@ -3,20 +3,18 @@
 import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
-import {
-    createToolbarEvent,
-    sendAnalytics
-} from '../../../analytics';
+import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
 import { RAISE_HAND_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconRaiseHand } from '../../../base/icons';
+import { translate } from '../../../base/i18n/functions';
+import { IconRaiseHand } from '../../../base/icons/svg';
+import { raiseHand } from '../../../base/participants/actions';
 import {
     getLocalParticipant,
-    hasRaisedHand,
-    raiseHand
-} from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+    hasRaisedHand
+} from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 /**
  * The type of the React {@code Component} props of {@link RaiseHandButton}.
diff --git a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js
index f6d6418eef..49eb884b1a 100644
--- a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js
+++ b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js
@@ -4,10 +4,11 @@ import { connect } from 'react-redux';
 
 import { ANDROID_SCREENSHARING_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconScreenshare } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
-import { isLocalVideoTrackDesktop, toggleScreensharing } from '../../../base/tracks';
+import { translate } from '../../../base/i18n/functions';
+import { IconScreenshare } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
+import { toggleScreensharing } from '../../../base/tracks/actions.native';
+import { isLocalVideoTrackDesktop } from '../../../base/tracks/functions.native';
 
 /**
  * The type of the React {@code Component} props of {@link ScreenSharingAndroidButton}.
diff --git a/react/features/toolbox/components/native/ScreenSharingIosButton.js b/react/features/toolbox/components/native/ScreenSharingIosButton.js
index 3812d56e00..ef00954c62 100644
--- a/react/features/toolbox/components/native/ScreenSharingIosButton.js
+++ b/react/features/toolbox/components/native/ScreenSharingIosButton.js
@@ -7,10 +7,10 @@ import { connect } from 'react-redux';
 
 import { IOS_SCREENSHARING_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
-import { IconScreenshare } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
-import { isLocalVideoTrackDesktop } from '../../../base/tracks';
+import { translate } from '../../../base/i18n/functions';
+import { IconScreenshare } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
+import { isLocalVideoTrackDesktop } from '../../../base/tracks/functions.native';
 
 /**
  * The type of the React {@code Component} props of {@link ScreenSharingIosButton}.
diff --git a/react/features/toolbox/components/native/ToggleCameraButton.js b/react/features/toolbox/components/native/ToggleCameraButton.js
index 526e70c92d..5064759c3c 100644
--- a/react/features/toolbox/components/native/ToggleCameraButton.js
+++ b/react/features/toolbox/components/native/ToggleCameraButton.js
@@ -2,11 +2,12 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { IconCameraRefresh } from '../../../base/icons';
-import { MEDIA_TYPE, toggleCameraFacingMode } from '../../../base/media';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
-import { isLocalTrackMuted } from '../../../base/tracks';
+import { translate } from '../../../base/i18n/functions';
+import { IconCameraRefresh } from '../../../base/icons/svg';
+import { toggleCameraFacingMode } from '../../../base/media/actions';
+import { MEDIA_TYPE } from '../../../base/media/constants';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
+import { isLocalTrackMuted } from '../../../base/tracks/functions.native';
 
 /**
  * The type of the React {@code Component} props of {@link ToggleCameraButton}.
diff --git a/react/features/toolbox/components/native/ToggleSelfViewButton.js b/react/features/toolbox/components/native/ToggleSelfViewButton.js
index d67d6f937d..0ff49cb55c 100644
--- a/react/features/toolbox/components/native/ToggleSelfViewButton.js
+++ b/react/features/toolbox/components/native/ToggleSelfViewButton.js
@@ -2,10 +2,10 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { IconAudioOnlyOff } from '../../../base/icons';
-import { updateSettings } from '../../../base/settings';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconAudioOnlyOff } from '../../../base/icons/svg';
+import { updateSettings } from '../../../base/settings/actions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 /**
  * The type of the React {@code Component} props of {@link ToggleSelfViewButton}.
diff --git a/react/features/toolbox/components/native/Toolbox.js b/react/features/toolbox/components/native/Toolbox.js
index 14f8d77af6..9ad5ecb7ea 100644
--- a/react/features/toolbox/components/native/Toolbox.js
+++ b/react/features/toolbox/components/native/Toolbox.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 
 import ColorSchemeRegistry from '../../../base/color-scheme/ColorSchemeRegistry';
 import { Platform } from '../../../base/react';
-import { StyleType } from '../../../base/styles';
+import { StyleType } from '../../../base/styles/functions.native';
 import ChatButton from '../../../chat/components/native/ChatButton';
 import ReactionsMenuButton from '../../../reactions/components/native/ReactionsMenuButton';
 import { isReactionsEnabled } from '../../../reactions/functions.any';
diff --git a/react/features/toolbox/components/web/Toolbox.tsx b/react/features/toolbox/components/web/Toolbox.tsx
index d5df715fe5..07fc1e1bb8 100644
--- a/react/features/toolbox/components/web/Toolbox.tsx
+++ b/react/features/toolbox/components/web/Toolbox.tsx
@@ -43,7 +43,7 @@ import { isGifEnabled } from '../../../gifs/functions';
 import InviteButton from '../../../invite/components/add-people-dialog/web/InviteButton';
 import { isVpaasMeeting } from '../../../jaas/functions';
 import KeyboardShortcutsButton from '../../../keyboard-shortcuts/components/web/KeyboardShortcutsButton';
-import { NoiseSuppressionButton } from '../../../noise-suppression/components';
+import NoiseSuppressionButton from '../../../noise-suppression/components/NoiseSuppressionButton';
 import {
     close as closeParticipantsPane,
     open as openParticipantsPane
diff --git a/react/features/transcribing/components/TranscribingExpandedLabel.native.js b/react/features/transcribing/components/TranscribingExpandedLabel.native.js
index bfab6d9c0e..4e4a5e7fa2 100644
--- a/react/features/transcribing/components/TranscribingExpandedLabel.native.js
+++ b/react/features/transcribing/components/TranscribingExpandedLabel.native.js
@@ -1,7 +1,7 @@
 // @flow
 
-import { translate } from '../../base/i18n';
-import { type Props as AbstractProps, ExpandedLabel } from '../../base/label';
+import { translate } from '../../base/i18n/functions';
+import ExpandedLabel, { Props as AbstractProps } from '../../base/label/components/native/ExpandedLabel';
 
 type Props = AbstractProps & {
     t: Function
diff --git a/react/features/transcribing/components/TranscribingLabel.native.js b/react/features/transcribing/components/TranscribingLabel.native.js
index 7501cdb9f9..3d8f0db5c7 100644
--- a/react/features/transcribing/components/TranscribingLabel.native.js
+++ b/react/features/transcribing/components/TranscribingLabel.native.js
@@ -3,8 +3,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { Label } from '../../base/label';
+import { translate } from '../../base/i18n/functions';
+import Label from '../../base/label/components/native/Label';
 
 import { type Props, _mapStateToProps } from './AbstractTranscribingLabel';
 
diff --git a/react/features/video-menu/components/index.native.ts b/react/features/video-menu/components/index.native.ts
index 738c4d2b8a..976ea9ba87 100644
--- a/react/features/video-menu/components/index.native.ts
+++ b/react/features/video-menu/components/index.native.ts
@@ -1 +1,11 @@
-export * from './native';
+/* eslint-disable lines-around-comment */
+// @ts-ignore
+export { default as GrantModeratorDialog } from './native/GrantModeratorDialog';
+// @ts-ignore
+export { default as KickRemoteParticipantDialog } from './native/KickRemoteParticipantDialog';
+// @ts-ignore
+export { default as MuteEveryoneDialog } from './native/MuteEveryoneDialog';
+// @ts-ignore
+export { default as MuteEveryonesVideoDialog } from './native/MuteEveryonesVideoDialog';
+// @ts-ignore
+export { default as MuteRemoteParticipantsVideoDialog } from './native/MuteRemoteParticipantsVideoDialog';
diff --git a/react/features/video-menu/components/index.web.ts b/react/features/video-menu/components/index.web.ts
index b80c83af34..36c5e0cd63 100644
--- a/react/features/video-menu/components/index.web.ts
+++ b/react/features/video-menu/components/index.web.ts
@@ -1 +1,5 @@
-export * from './web';
+export { default as GrantModeratorDialog } from './web/GrantModeratorDialog';
+export { default as KickRemoteParticipantDialog } from './web/KickRemoteParticipantDialog';
+export { default as MuteEveryoneDialog } from './web/MuteEveryoneDialog';
+export { default as MuteEveryonesVideoDialog } from './web/MuteEveryonesVideoDialog';
+export { default as MuteRemoteParticipantsVideoDialog } from './web/MuteRemoteParticipantsVideoDialog';
diff --git a/react/features/video-menu/components/native/AskUnmuteButton.js b/react/features/video-menu/components/native/AskUnmuteButton.js
index 846820b356..2a7e4bcde9 100644
--- a/react/features/video-menu/components/native/AskUnmuteButton.js
+++ b/react/features/video-menu/components/native/AskUnmuteButton.js
@@ -4,11 +4,11 @@ import { connect } from 'react-redux';
 
 import { approveParticipant } from '../../../av-moderation/actions';
 import { isSupported } from '../../../av-moderation/functions';
-import { translate } from '../../../base/i18n';
-import { IconMic, IconVideo } from '../../../base/icons';
-import { MEDIA_TYPE } from '../../../base/media';
-import { getParticipantById, isLocalParticipantModerator } from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconMic, IconVideo } from '../../../base/icons/svg';
+import { MEDIA_TYPE } from '../../../base/media/constants';
+import { getParticipantById, isLocalParticipantModerator } from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { isForceMuted } from '../../../participants-pane/functions';
 
 export type Props = AbstractButtonProps & {
diff --git a/react/features/video-menu/components/native/ConnectionStatusButton.js b/react/features/video-menu/components/native/ConnectionStatusButton.js
index 5900b90b8f..50ff1c7944 100644
--- a/react/features/video-menu/components/native/ConnectionStatusButton.js
+++ b/react/features/video-menu/components/native/ConnectionStatusButton.js
@@ -1,9 +1,9 @@
 import { connect } from 'react-redux';
 
 import { openSheet } from '../../../base/dialog/actions';
-import { translate } from '../../../base/i18n';
-import { IconInfoCircle } from '../../../base/icons';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconInfoCircle } from '../../../base/icons/svg';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 
 import ConnectionStatusComponent from './ConnectionStatusComponent';
 
diff --git a/react/features/video-menu/components/native/GrantModeratorButton.js b/react/features/video-menu/components/native/GrantModeratorButton.js
index 8d1c46ee00..d5f8de5807 100644
--- a/react/features/video-menu/components/native/GrantModeratorButton.js
+++ b/react/features/video-menu/components/native/GrantModeratorButton.js
@@ -2,7 +2,7 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractGrantModeratorButton, {
     _mapStateToProps
 } from '../AbstractGrantModeratorButton';
diff --git a/react/features/video-menu/components/native/GrantModeratorDialog.js b/react/features/video-menu/components/native/GrantModeratorDialog.js
index c3a6bee7de..492dc8d2a3 100644
--- a/react/features/video-menu/components/native/GrantModeratorDialog.js
+++ b/react/features/video-menu/components/native/GrantModeratorDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractGrantModeratorDialog, { abstractMapStateToProps }
     from '../AbstractGrantModeratorDialog';
 
diff --git a/react/features/video-menu/components/native/KickButton.js b/react/features/video-menu/components/native/KickButton.js
index d18a987e56..a5c78ab9e3 100644
--- a/react/features/video-menu/components/native/KickButton.js
+++ b/react/features/video-menu/components/native/KickButton.js
@@ -2,8 +2,8 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { isLocalParticipantModerator } from '../../../base/participants';
+import { translate } from '../../../base/i18n/functions';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import AbstractKickButton from '../AbstractKickButton';
 
 /**
diff --git a/react/features/video-menu/components/native/KickRemoteParticipantDialog.js b/react/features/video-menu/components/native/KickRemoteParticipantDialog.js
index 3fd11beeea..fab6f065fb 100644
--- a/react/features/video-menu/components/native/KickRemoteParticipantDialog.js
+++ b/react/features/video-menu/components/native/KickRemoteParticipantDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractKickRemoteParticipantDialog
     from '../AbstractKickRemoteParticipantDialog';
 
diff --git a/react/features/video-menu/components/native/LocalVideoMenu.js b/react/features/video-menu/components/native/LocalVideoMenu.js
index f57b5dcc5d..7b5d3a2b8d 100644
--- a/react/features/video-menu/components/native/LocalVideoMenu.js
+++ b/react/features/video-menu/components/native/LocalVideoMenu.js
@@ -5,11 +5,11 @@ import { connect } from 'react-redux';
 import Avatar from '../../../base/avatar/components/Avatar';
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
 import { bottomSheetStyles } from '../../../base/dialog/components/native/styles';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import {
     getLocalParticipant,
     getParticipantDisplayName
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import ToggleSelfViewButton from '../../../toolbox/components/native/ToggleSelfViewButton';
 
 import ConnectionStatusButton from './ConnectionStatusButton';
diff --git a/react/features/video-menu/components/native/MuteButton.js b/react/features/video-menu/components/native/MuteButton.js
index d7d3363c77..c9920c4787 100644
--- a/react/features/video-menu/components/native/MuteButton.js
+++ b/react/features/video-menu/components/native/MuteButton.js
@@ -2,8 +2,8 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { isLocalParticipantModerator } from '../../../base/participants';
+import { translate } from '../../../base/i18n/functions';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import AbstractMuteButton, { _mapStateToProps as _abstractMapStateToProps } from '../AbstractMuteButton';
 
 /**
diff --git a/react/features/video-menu/components/native/MuteEveryoneDialog.js b/react/features/video-menu/components/native/MuteEveryoneDialog.js
index 1b4c9c80bc..b4d1f2fddf 100644
--- a/react/features/video-menu/components/native/MuteEveryoneDialog.js
+++ b/react/features/video-menu/components/native/MuteEveryoneDialog.js
@@ -4,7 +4,7 @@ import { Divider } from 'react-native-paper';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractMuteEveryoneDialog, {
     type IProps,
     abstractMapStateToProps as _mapStateToProps } from '../AbstractMuteEveryoneDialog';
diff --git a/react/features/video-menu/components/native/MuteEveryoneElseButton.js b/react/features/video-menu/components/native/MuteEveryoneElseButton.js
index f3e97f2698..93d7cea232 100644
--- a/react/features/video-menu/components/native/MuteEveryoneElseButton.js
+++ b/react/features/video-menu/components/native/MuteEveryoneElseButton.js
@@ -2,8 +2,8 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { isLocalParticipantModerator } from '../../../base/participants';
+import { translate } from '../../../base/i18n/functions';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import AbstractMuteEveryoneElseButton from '../AbstractMuteEveryoneElseButton';
 
 /**
diff --git a/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js b/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js
index 1a95d8a6cc..75cbcdc48b 100644
--- a/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js
+++ b/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js
@@ -4,7 +4,7 @@ import { Divider } from 'react-native-paper';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractMuteEveryonesVideoDialog, {
     type IProps,
     abstractMapStateToProps as _mapStateToProps } from '../AbstractMuteEveryonesVideoDialog';
diff --git a/react/features/video-menu/components/native/MuteRemoteParticipantsVideoDialog.js b/react/features/video-menu/components/native/MuteRemoteParticipantsVideoDialog.js
index b3601257f4..23b7fd25ba 100644
--- a/react/features/video-menu/components/native/MuteRemoteParticipantsVideoDialog.js
+++ b/react/features/video-menu/components/native/MuteRemoteParticipantsVideoDialog.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import ConfirmDialog from '../../../base/dialog/components/native/ConfirmDialog';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import AbstractMuteRemoteParticipantsVideoDialog, {
     abstractMapStateToProps
 } from '../AbstractMuteRemoteParticipantsVideoDialog';
diff --git a/react/features/video-menu/components/native/MuteVideoButton.js b/react/features/video-menu/components/native/MuteVideoButton.js
index cfd3478904..112db8ca93 100644
--- a/react/features/video-menu/components/native/MuteVideoButton.js
+++ b/react/features/video-menu/components/native/MuteVideoButton.js
@@ -2,8 +2,8 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { isLocalParticipantModerator } from '../../../base/participants';
+import { translate } from '../../../base/i18n/functions';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import AbstractMuteVideoButton, { _mapStateToProps as _abstractMapStateToProps } from '../AbstractMuteVideoButton';
 
 /**
diff --git a/react/features/video-menu/components/native/PinButton.js b/react/features/video-menu/components/native/PinButton.js
index 06026cc8c1..c9e1668d29 100644
--- a/react/features/video-menu/components/native/PinButton.js
+++ b/react/features/video-menu/components/native/PinButton.js
@@ -2,10 +2,10 @@
 
 import { connect } from 'react-redux';
 
-import { translate } from '../../../base/i18n';
-import { IconEnlarge } from '../../../base/icons';
-import { pinParticipant } from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { translate } from '../../../base/i18n/functions';
+import { IconEnlarge } from '../../../base/icons/svg';
+import { pinParticipant } from '../../../base/participants/actions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { shouldDisplayTileView } from '../../../video-layout/functions';
 
 export type Props = AbstractButtonProps & {
diff --git a/react/features/video-menu/components/native/RemoteVideoMenu.js b/react/features/video-menu/components/native/RemoteVideoMenu.js
index e30a202014..80a1c64766 100644
--- a/react/features/video-menu/components/native/RemoteVideoMenu.js
+++ b/react/features/video-menu/components/native/RemoteVideoMenu.js
@@ -9,12 +9,12 @@ import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
 import { bottomSheetStyles } from '../../../base/dialog/components/native/styles';
 import { KICK_OUT_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
-import { translate } from '../../../base/i18n';
+import { translate } from '../../../base/i18n/functions';
 import {
     getParticipantById,
     getParticipantDisplayName,
     isLocalParticipantModerator
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import { getBreakoutRooms, getCurrentRoomId } from '../../../breakout-rooms/functions';
 import PrivateMessageButton from '../../../chat/components/native/PrivateMessageButton';
 import ConnectionStatusButton from '../native/ConnectionStatusButton';
diff --git a/react/features/video-menu/components/native/SendToBreakoutRoom.js b/react/features/video-menu/components/native/SendToBreakoutRoom.js
index 4dedd921e0..2e0fca0527 100644
--- a/react/features/video-menu/components/native/SendToBreakoutRoom.js
+++ b/react/features/video-menu/components/native/SendToBreakoutRoom.js
@@ -2,11 +2,12 @@
 
 import { connect } from 'react-redux';
 
-import { createBreakoutRoomsEvent, sendAnalytics } from '../../../analytics';
-import { translate } from '../../../base/i18n';
-import { IconRingGroup } from '../../../base/icons';
-import { isLocalParticipantModerator } from '../../../base/participants';
-import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+import { createBreakoutRoomsEvent } from '../../../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../../../analytics/functions';
+import { translate } from '../../../base/i18n/functions';
+import { IconRingGroup } from '../../../base/icons/svg';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
+import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { sendParticipantToRoom } from '../../../breakout-rooms/actions';
 
 export type Props = AbstractButtonProps & {
diff --git a/react/features/video-menu/components/native/SharedVideoMenu.js b/react/features/video-menu/components/native/SharedVideoMenu.js
index 235f432791..dd4f5ff852 100644
--- a/react/features/video-menu/components/native/SharedVideoMenu.js
+++ b/react/features/video-menu/components/native/SharedVideoMenu.js
@@ -12,7 +12,7 @@ import { bottomSheetStyles } from '../../../base/dialog/components/native/styles
 import {
     getParticipantById,
     getParticipantDisplayName
-} from '../../../base/participants';
+} from '../../../base/participants/functions';
 import { SharedVideoButton } from '../../../shared-video/components';
 
 import styles from './styles';
diff --git a/react/features/video-menu/components/native/VolumeSlider.js b/react/features/video-menu/components/native/VolumeSlider.js
index 04662aac7a..bd2c339026 100644
--- a/react/features/video-menu/components/native/VolumeSlider.js
+++ b/react/features/video-menu/components/native/VolumeSlider.js
@@ -7,7 +7,8 @@ import { View } from 'react-native';
 import { withTheme } from 'react-native-paper';
 import { connect } from 'react-redux';
 
-import { Icon, IconVolumeUp } from '../../../base/icons';
+import Icon from '../../../base/icons/components/Icon';
+import { IconVolumeUp } from '../../../base/icons/svg';
 import { setVolume } from '../../../participants-pane/actions.native';
 import { VOLUME_SLIDER_SCALE } from '../../constants';
 
diff --git a/react/features/video-menu/components/native/index.ts b/react/features/video-menu/components/native/index.ts
deleted file mode 100644
index f4b7697df9..0000000000
--- a/react/features/video-menu/components/native/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* eslint-disable lines-around-comment */
-// @ts-ignore
-export { default as GrantModeratorDialog } from './GrantModeratorDialog';
-// @ts-ignore
-export { default as KickRemoteParticipantDialog } from './KickRemoteParticipantDialog';
-// @ts-ignore
-export { default as MuteEveryoneDialog } from './MuteEveryoneDialog';
-// @ts-ignore
-export { default as MuteEveryonesVideoDialog } from './MuteEveryonesVideoDialog';
-// @ts-ignore
-export { default as MuteRemoteParticipantsVideoDialog } from './MuteRemoteParticipantsVideoDialog';
-// @ts-ignore
-export { default as LocalVideoMenu } from './LocalVideoMenu';
-// @ts-ignore
-export { default as RemoteVideoMenu } from './RemoteVideoMenu';
-// @ts-ignore
-export { default as SharedVideoMenu } from './SharedVideoMenu';
-// @ts-ignore
-export { default as VolumeSlider } from './VolumeSlider';
diff --git a/react/features/video-menu/components/native/styles.js b/react/features/video-menu/components/native/styles.js
index 4156cad9e2..9940a799e4 100644
--- a/react/features/video-menu/components/native/styles.js
+++ b/react/features/video-menu/components/native/styles.js
@@ -5,7 +5,8 @@ import {
     MD_ITEM_HEIGHT,
     MD_ITEM_MARGIN_PADDING
 } from '../../../base/dialog/components/native/styles';
-import { ColorPalette, createStyleSheet } from '../../../base/styles';
+import { ColorPalette } from '../../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../../base/styles/functions.native';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 export default createStyleSheet({
diff --git a/react/features/video-menu/components/web/index.ts b/react/features/video-menu/components/web/index.ts
deleted file mode 100644
index d1d5e7930c..0000000000
--- a/react/features/video-menu/components/web/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as GrantModeratorDialog } from './GrantModeratorDialog';
-export { default as KickRemoteParticipantDialog } from './KickRemoteParticipantDialog';
-export { default as MuteEveryoneDialog } from './MuteEveryoneDialog';
-export { default as MuteEveryonesVideoDialog } from './MuteEveryonesVideoDialog';
-export { default as MuteRemoteParticipantsVideoDialog } from './MuteRemoteParticipantsVideoDialog';
diff --git a/react/features/video-quality/components/VideoQualityExpandedLabel.native.js b/react/features/video-quality/components/VideoQualityExpandedLabel.native.js
index 4189740498..7287ee12cc 100644
--- a/react/features/video-quality/components/VideoQualityExpandedLabel.native.js
+++ b/react/features/video-quality/components/VideoQualityExpandedLabel.native.js
@@ -1,7 +1,7 @@
 // @flow
 
-import { translate } from '../../base/i18n';
-import { type Props as AbstractProps, ExpandedLabel } from '../../base/label';
+import { translate } from '../../base/i18n/functions';
+import ExpandedLabel, { Props as AbstractProps } from '../../base/label/components/native/ExpandedLabel';
 
 import { AUD_LABEL_COLOR } from './styles';
 
diff --git a/react/features/video-quality/components/VideoQualityLabel.native.js b/react/features/video-quality/components/VideoQualityLabel.native.js
index 9b5112de91..b3605cbc10 100644
--- a/react/features/video-quality/components/VideoQualityLabel.native.js
+++ b/react/features/video-quality/components/VideoQualityLabel.native.js
@@ -3,9 +3,9 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import { translate } from '../../base/i18n';
-import { Label } from '../../base/label';
-import { type StyleType, combineStyles } from '../../base/styles';
+import { translate } from '../../base/i18n/functions';
+import Label from '../../base/label/components/native/Label';
+import { StyleType, combineStyles } from '../../base/styles/functions.native';
 
 import AbstractVideoQualityLabel, {
     IProps as AbstractProps,
diff --git a/react/features/video-quality/components/VideoQualityLabel.web.js b/react/features/video-quality/components/VideoQualityLabel.web.js
index 3517b31298..245d34e351 100644
--- a/react/features/video-quality/components/VideoQualityLabel.web.js
+++ b/react/features/video-quality/components/VideoQualityLabel.web.js
@@ -4,9 +4,9 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { openDialog } from '../../base/dialog/actions';
-import { translate } from '../../base/i18n';
-import { IconPerformance } from '../../base/icons';
-import { Label } from '../../base/label';
+import { translate } from '../../base/i18n/functions';
+import { IconPerformance } from '../../base/icons/svg';
+import Label from '../../base/label/components/web/Label';
 import { COLORS } from '../../base/label/constants';
 import Tooltip from '../../base/tooltip/components/Tooltip';
 import { shouldDisplayTileView } from '../../video-layout/functions.web';
diff --git a/react/features/video-quality/components/styles.js b/react/features/video-quality/components/styles.js
index dbef4f5609..916c347382 100644
--- a/react/features/video-quality/components/styles.js
+++ b/react/features/video-quality/components/styles.js
@@ -1,4 +1,5 @@
-import { ColorPalette, createStyleSheet } from '../../base/styles';
+import { ColorPalette } from '../../base/styles/components/styles/ColorPalette';
+import { createStyleSheet } from '../../base/styles/functions.any';
 import BaseTheme from '../../base/ui/components/BaseTheme.native';
 
 export const AUD_LABEL_COLOR = ColorPalette.green;
diff --git a/react/features/welcome/components/WelcomePage.native.js b/react/features/welcome/components/WelcomePage.native.js
index 94e2cbaa47..e51a5ae884 100644
--- a/react/features/welcome/components/WelcomePage.native.js
+++ b/react/features/welcome/components/WelcomePage.native.js
@@ -3,8 +3,9 @@ import { Animated, SafeAreaView, TouchableHighlight, View } from 'react-native';
 import { connect } from 'react-redux';
 
 import { getName } from '../../app/functions';
-import { translate } from '../../base/i18n';
-import { Icon, IconWarning } from '../../base/icons';
+import { translate } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconWarning } from '../../base/icons/svg';
 import { LoadingIndicator, Text } from '../../base/react';
 import BaseTheme from '../../base/ui/components/BaseTheme.native';
 import Button from '../../base/ui/components/native/Button';
diff --git a/react/features/welcome/components/WelcomePage.web.js b/react/features/welcome/components/WelcomePage.web.js
index 15d57a8405..7dec3a9c06 100644
--- a/react/features/welcome/components/WelcomePage.web.js
+++ b/react/features/welcome/components/WelcomePage.web.js
@@ -4,8 +4,9 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { isMobileBrowser } from '../../base/environment/utils';
-import { translate, translateToHTML } from '../../base/i18n';
-import { Icon, IconWarning } from '../../base/icons';
+import { translate, translateToHTML } from '../../base/i18n/functions';
+import Icon from '../../base/icons/components/Icon';
+import { IconWarning } from '../../base/icons/svg';
 import { Watermarks } from '../../base/react';
 import CalendarList from '../../calendar-sync/components/CalendarList.web';
 import RecentList from '../../recent-list/components/RecentList.web';
diff --git a/react/features/welcome/components/styles.js b/react/features/welcome/components/styles.js
index c897119bb8..5088f4e95c 100644
--- a/react/features/welcome/components/styles.js
+++ b/react/features/welcome/components/styles.js
@@ -2,7 +2,7 @@
 
 import { StyleSheet } from 'react-native';
 
-import { BoxModel } from '../../base/styles';
+import { BoxModel } from '../../base/styles/components/styles/BoxModel';
 import BaseTheme from '../../base/ui/components/BaseTheme.native';
 
 export const AVATAR_SIZE = 104;
diff --git a/react/index.native.js b/react/index.native.js
index 231d9b88cd..0132be91ac 100644
--- a/react/index.native.js
+++ b/react/index.native.js
@@ -11,7 +11,7 @@ import './features/mobile/polyfills';
 import React, { PureComponent } from 'react';
 import { AppRegistry } from 'react-native';
 
-import { App } from './features/app/components';
+import { App } from './features/app/components/App.native';
 import { _initLogging } from './features/base/logging/functions';
 import JitsiThemePaperProvider from './features/base/ui/components/JitsiThemeProvider';
 
diff --git a/react/index.web.js b/react/index.web.js
index c3ba869520..7121c2e21a 100644
--- a/react/index.web.js
+++ b/react/index.web.js
@@ -3,10 +3,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { App } from './features/app/components';
+import { App } from './features/app/components/App.web';
 import { getLogger } from './features/base/logging/functions';
 import { Platform } from './features/base/react';
-import { getJitsiMeetGlobalNS } from './features/base/util';
+import { getJitsiMeetGlobalNS } from './features/base/util/helpers';
 import DialInSummaryApp from './features/invite/components/dial-in-summary/web/DialInSummaryApp';
 import PrejoinApp from './features/prejoin/components/web/PrejoinApp';