diff --git a/packages/shared-components/.storybook/preview.tsx b/packages/shared-components/.storybook/preview.tsx
index 2fc4680148..c3f22b4824 100644
--- a/packages/shared-components/.storybook/preview.tsx
+++ b/packages/shared-components/.storybook/preview.tsx
@@ -7,7 +7,7 @@ import "@fontsource/inter/700.css";
 import "./compound.css";
 import "./preview.css";
 import React, { useLayoutEffect } from "react";
-import { setLanguage } from "../src/utils/i18n";
+import { setLanguage } from "../src/core/i18n/i18n";
 import { TooltipProvider } from "@vector-im/compound-web";
 import { StoryContext } from "storybook/internal/csf";
 import { I18nApi, I18nContext } from "../src";
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..9dc97a2cfd
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..0a0192f636
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..498eadee7a
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..7aa5d727f8
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/without-close-button-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/without-close-button-auto.png
new file mode 100644
index 0000000000..f62f538fd3
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/Pill/Pill.stories.tsx/without-close-button-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..79d66f2045
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/no-child-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/no-child-auto.png
new file mode 100644
index 0000000000..0b2bf034da
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/pill-input/PillInput/PillInput.stories.tsx/no-child-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..bdc40f5c92
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/hover-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/hover-auto.png
new file mode 100644
index 0000000000..bdc40f5c92
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/hover-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/selected-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/selected-auto.png
new file mode 100644
index 0000000000..699f811329
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/selected-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/separator-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/separator-auto.png
new file mode 100644
index 0000000000..45100e219c
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/separator-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/without-timestamp-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/without-timestamp-auto.png
new file mode 100644
index 0000000000..4a11e617b5
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichItem/RichItem.stories.tsx/without-timestamp-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..341955065c
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/empty-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/empty-auto.png
new file mode 100644
index 0000000000..9f3a4e8538
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/rich-list/RichList/RichList.stories.tsx/empty-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/default-auto.png
new file mode 100644
index 0000000000..e62ad7d61a
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-room-alias-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-room-alias-auto.png
new file mode 100644
index 0000000000..39088d818b
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-room-alias-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-user-id-auto.png b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-user-id-auto.png
new file mode 100644
index 0000000000..ac06b20062
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/core/utils/LinkedText/LinkedText.stories.tsx/with-user-id-auto.png differ
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx
index b81b79ea57..b7f3dd2e5b 100644
--- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx
@@ -10,7 +10,7 @@ import { fn } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type AudioPlayerProps = AudioPlayerViewSnapshot & AudioPlayerViewActions;
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx
index 89e08bb340..693623a03e 100644
--- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx
@@ -14,8 +14,8 @@ import { describe, it, vi, afterEach, expect } from "vitest";
 
 import * as stories from "./AudioPlayerView.stories.tsx";
 import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView";
-import { MockViewModel } from "../../viewmodel/MockViewModel.ts";
-import { I18nContext } from "../../utils/i18nContext.ts";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel.ts";
+import { I18nContext } from "../../core/i18n/i18nContext.ts";
 import { I18nApi } from "../../index.ts";
 
 const { Default, NoMediaName, NoSize, HasError } = composeStories(stories);
diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx
index 43afc231b8..63f4055ef2 100644
--- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx
+++ b/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx
@@ -7,14 +7,14 @@
 
 import React, { type ChangeEventHandler, type JSX, type KeyboardEventHandler, type MouseEventHandler } from "react";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import { MediaBody } from "../../message-body/MediaBody";
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 import styles from "./AudioPlayerView.module.css";
 import { PlayPauseButton } from "../PlayPauseButton";
 import { type PlaybackState } from "../playback";
-import { useI18n } from "../../utils/i18nContext";
-import { formatBytes } from "../../utils/FormattingUtils";
+import { useI18n } from "../../core/i18n/i18nContext";
+import { formatBytes } from "../../core/utils/FormattingUtils";
 import { Clock } from "../Clock";
 import { SeekBar } from "../SeekBar";
 
diff --git a/packages/shared-components/src/audio/Clock/Clock.tsx b/packages/shared-components/src/audio/Clock/Clock.tsx
index 7b8d9496cb..2bbe6e4a01 100644
--- a/packages/shared-components/src/audio/Clock/Clock.tsx
+++ b/packages/shared-components/src/audio/Clock/Clock.tsx
@@ -9,7 +9,7 @@ import React, { type JSX, type HTMLProps, useMemo } from "react";
 import { Temporal } from "temporal-polyfill";
 import classNames from "classnames";
 
-import { formatSeconds } from "../../utils/DateUtils";
+import { formatSeconds } from "../../core/utils/DateUtils";
 
 export interface Props extends Pick<HTMLProps<HTMLSpanElement>, "aria-live" | "role" | "className"> {
     /**
diff --git a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx
index cc2ab5bb65..529e746b8c 100644
--- a/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx
+++ b/packages/shared-components/src/audio/PlayPauseButton/PlayPauseButton.tsx
@@ -11,7 +11,7 @@ import Play from "@vector-im/compound-design-tokens/assets/web/icons/play-solid"
 import Pause from "@vector-im/compound-design-tokens/assets/web/icons/pause-solid";
 
 import styles from "./PlayPauseButton.module.css";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 export interface PlayPauseButtonProps extends HTMLAttributes<HTMLButtonElement> {
     /**
diff --git a/packages/shared-components/src/audio/SeekBar/SeekBar.tsx b/packages/shared-components/src/audio/SeekBar/SeekBar.tsx
index a30e527eee..48882aae88 100644
--- a/packages/shared-components/src/audio/SeekBar/SeekBar.tsx
+++ b/packages/shared-components/src/audio/SeekBar/SeekBar.tsx
@@ -10,7 +10,7 @@ import { throttle } from "lodash";
 import classNames from "classnames";
 
 import style from "./SeekBar.module.css";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 export interface SeekBarProps extends React.InputHTMLAttributes<HTMLInputElement> {
     /**
diff --git a/packages/shared-components/src/composer/Banner/Banner.tsx b/packages/shared-components/src/composer/Banner/Banner.tsx
index 56d53f87ad..0e5779d8fd 100644
--- a/packages/shared-components/src/composer/Banner/Banner.tsx
+++ b/packages/shared-components/src/composer/Banner/Banner.tsx
@@ -20,7 +20,7 @@ import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error"
 import InfoIcon from "@vector-im/compound-design-tokens/assets/web/icons/info";
 
 import styles from "./Banner.module.css";
-import { _t } from "../../utils/i18n";
+import { _t } from "../../core/i18n/i18n";
 
 interface BannerProps {
     /**
diff --git a/packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx b/packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx
rename to packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.stories.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.tsx b/packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.tsx
rename to packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/FlatVirtualizedList.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/index.ts b/packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/FlatVirtualizedList/index.ts
rename to packages/shared-components/src/core/VirtualizedList/FlatVirtualizedList/index.ts
diff --git a/packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx b/packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx
rename to packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.stories.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.tsx b/packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.tsx
rename to packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/GroupedVirtualizedList.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/index.ts b/packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/GroupedVirtualizedList/index.ts
rename to packages/shared-components/src/core/VirtualizedList/GroupedVirtualizedList/index.ts
diff --git a/packages/shared-components/src/utils/VirtualizedList/accessbility.ts b/packages/shared-components/src/core/VirtualizedList/accessbility.ts
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/accessbility.ts
rename to packages/shared-components/src/core/VirtualizedList/accessbility.ts
diff --git a/packages/shared-components/src/utils/VirtualizedList/index.ts b/packages/shared-components/src/core/VirtualizedList/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/index.ts
rename to packages/shared-components/src/core/VirtualizedList/index.ts
diff --git a/packages/shared-components/src/utils/VirtualizedList/story-mock.module.css b/packages/shared-components/src/core/VirtualizedList/story-mock.module.css
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/story-mock.module.css
rename to packages/shared-components/src/core/VirtualizedList/story-mock.module.css
diff --git a/packages/shared-components/src/utils/VirtualizedList/story-mock.tsx b/packages/shared-components/src/core/VirtualizedList/story-mock.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/story-mock.tsx
rename to packages/shared-components/src/core/VirtualizedList/story-mock.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/virtualized-list.test.tsx b/packages/shared-components/src/core/VirtualizedList/virtualized-list.test.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/virtualized-list.test.tsx
rename to packages/shared-components/src/core/VirtualizedList/virtualized-list.test.tsx
diff --git a/packages/shared-components/src/utils/VirtualizedList/virtualized-list.tsx b/packages/shared-components/src/core/VirtualizedList/virtualized-list.tsx
similarity index 100%
rename from packages/shared-components/src/utils/VirtualizedList/virtualized-list.tsx
rename to packages/shared-components/src/core/VirtualizedList/virtualized-list.tsx
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.module.css b/packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.module.css
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.module.css
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.module.css
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx b/packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.stories.tsx
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx b/packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.test.tsx
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.tsx b/packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.tsx
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/AvatarWithDetails.tsx
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/AvatarWithDetails.tsx
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap b/packages/shared-components/src/core/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/__snapshots__/AvatarWithDetails.test.tsx.snap
diff --git a/packages/shared-components/src/avatar/AvatarWithDetails/index.tsx b/packages/shared-components/src/core/avatar/AvatarWithDetails/index.tsx
similarity index 100%
rename from packages/shared-components/src/avatar/AvatarWithDetails/index.tsx
rename to packages/shared-components/src/core/avatar/AvatarWithDetails/index.tsx
diff --git a/packages/shared-components/src/hooks/useListKeyboardNavigation.test.ts b/packages/shared-components/src/core/hooks/useListKeyboardNavigation.test.ts
similarity index 100%
rename from packages/shared-components/src/hooks/useListKeyboardNavigation.test.ts
rename to packages/shared-components/src/core/hooks/useListKeyboardNavigation.test.ts
diff --git a/packages/shared-components/src/hooks/useListKeyboardNavigation.ts b/packages/shared-components/src/core/hooks/useListKeyboardNavigation.ts
similarity index 100%
rename from packages/shared-components/src/hooks/useListKeyboardNavigation.ts
rename to packages/shared-components/src/core/hooks/useListKeyboardNavigation.ts
diff --git a/packages/shared-components/src/utils/I18nApi.test.ts b/packages/shared-components/src/core/i18n/I18nApi.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/I18nApi.test.ts
rename to packages/shared-components/src/core/i18n/I18nApi.test.ts
diff --git a/packages/shared-components/src/utils/I18nApi.ts b/packages/shared-components/src/core/i18n/I18nApi.ts
similarity index 97%
rename from packages/shared-components/src/utils/I18nApi.ts
rename to packages/shared-components/src/core/i18n/I18nApi.ts
index a648f405f8..c15d1c3204 100644
--- a/packages/shared-components/src/utils/I18nApi.ts
+++ b/packages/shared-components/src/core/i18n/I18nApi.ts
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { type I18nApi as II18nApi, type Variables, type Translations } from "@element-hq/element-web-module-api";
 
-import { humanizeTime } from "./humanize";
+import { humanizeTime } from "../utils/humanize";
 import { _t, getLocale, registerTranslations } from "./i18n";
 
 export class I18nApi implements II18nApi {
diff --git a/packages/shared-components/src/utils/i18n.test.ts b/packages/shared-components/src/core/i18n/i18n.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/i18n.test.ts
rename to packages/shared-components/src/core/i18n/i18n.test.ts
diff --git a/packages/shared-components/src/utils/i18n.tsx b/packages/shared-components/src/core/i18n/i18n.tsx
similarity index 100%
rename from packages/shared-components/src/utils/i18n.tsx
rename to packages/shared-components/src/core/i18n/i18n.tsx
diff --git a/packages/shared-components/src/utils/i18nContext.ts b/packages/shared-components/src/core/i18n/i18nContext.ts
similarity index 100%
rename from packages/shared-components/src/utils/i18nContext.ts
rename to packages/shared-components/src/core/i18n/i18nContext.ts
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.module.css b/packages/shared-components/src/core/pill-input/Pill/Pill.module.css
similarity index 100%
rename from packages/shared-components/src/pill-input/Pill/Pill.module.css
rename to packages/shared-components/src/core/pill-input/Pill/Pill.module.css
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.stories.tsx b/packages/shared-components/src/core/pill-input/Pill/Pill.stories.tsx
similarity index 100%
rename from packages/shared-components/src/pill-input/Pill/Pill.stories.tsx
rename to packages/shared-components/src/core/pill-input/Pill/Pill.stories.tsx
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.test.tsx b/packages/shared-components/src/core/pill-input/Pill/Pill.test.tsx
similarity index 100%
rename from packages/shared-components/src/pill-input/Pill/Pill.test.tsx
rename to packages/shared-components/src/core/pill-input/Pill/Pill.test.tsx
diff --git a/packages/shared-components/src/pill-input/Pill/Pill.tsx b/packages/shared-components/src/core/pill-input/Pill/Pill.tsx
similarity index 97%
rename from packages/shared-components/src/pill-input/Pill/Pill.tsx
rename to packages/shared-components/src/core/pill-input/Pill/Pill.tsx
index 2b04fcd54c..2811c7854a 100644
--- a/packages/shared-components/src/pill-input/Pill/Pill.tsx
+++ b/packages/shared-components/src/core/pill-input/Pill/Pill.tsx
@@ -12,7 +12,7 @@ import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close"
 
 import { Flex } from "../../utils/Flex";
 import styles from "./Pill.module.css";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../i18n/i18nContext";
 
 export interface PillProps extends Omit<HTMLAttributes<HTMLDivElement>, "onClick"> {
     /**
diff --git a/packages/shared-components/src/pill-input/Pill/__snapshots__/Pill.test.tsx.snap b/packages/shared-components/src/core/pill-input/Pill/__snapshots__/Pill.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/pill-input/Pill/__snapshots__/Pill.test.tsx.snap
rename to packages/shared-components/src/core/pill-input/Pill/__snapshots__/Pill.test.tsx.snap
diff --git a/packages/shared-components/src/pill-input/Pill/index.ts b/packages/shared-components/src/core/pill-input/Pill/index.ts
similarity index 100%
rename from packages/shared-components/src/pill-input/Pill/index.ts
rename to packages/shared-components/src/core/pill-input/Pill/index.ts
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.module.css b/packages/shared-components/src/core/pill-input/PillInput/PillInput.module.css
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/PillInput.module.css
rename to packages/shared-components/src/core/pill-input/PillInput/PillInput.module.css
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.stories.tsx b/packages/shared-components/src/core/pill-input/PillInput/PillInput.stories.tsx
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/PillInput.stories.tsx
rename to packages/shared-components/src/core/pill-input/PillInput/PillInput.stories.tsx
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.test.tsx b/packages/shared-components/src/core/pill-input/PillInput/PillInput.test.tsx
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/PillInput.test.tsx
rename to packages/shared-components/src/core/pill-input/PillInput/PillInput.test.tsx
diff --git a/packages/shared-components/src/pill-input/PillInput/PillInput.tsx b/packages/shared-components/src/core/pill-input/PillInput/PillInput.tsx
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/PillInput.tsx
rename to packages/shared-components/src/core/pill-input/PillInput/PillInput.tsx
diff --git a/packages/shared-components/src/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap b/packages/shared-components/src/core/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap
rename to packages/shared-components/src/core/pill-input/PillInput/__snapshots__/PillInput.test.tsx.snap
diff --git a/packages/shared-components/src/pill-input/PillInput/index.ts b/packages/shared-components/src/core/pill-input/PillInput/index.ts
similarity index 100%
rename from packages/shared-components/src/pill-input/PillInput/index.ts
rename to packages/shared-components/src/core/pill-input/PillInput/index.ts
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.module.css b/packages/shared-components/src/core/rich-list/RichItem/RichItem.module.css
similarity index 100%
rename from packages/shared-components/src/rich-list/RichItem/RichItem.module.css
rename to packages/shared-components/src/core/rich-list/RichItem/RichItem.module.css
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.stories.tsx b/packages/shared-components/src/core/rich-list/RichItem/RichItem.stories.tsx
similarity index 100%
rename from packages/shared-components/src/rich-list/RichItem/RichItem.stories.tsx
rename to packages/shared-components/src/core/rich-list/RichItem/RichItem.stories.tsx
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.test.tsx b/packages/shared-components/src/core/rich-list/RichItem/RichItem.test.tsx
similarity index 100%
rename from packages/shared-components/src/rich-list/RichItem/RichItem.test.tsx
rename to packages/shared-components/src/core/rich-list/RichItem/RichItem.test.tsx
diff --git a/packages/shared-components/src/rich-list/RichItem/RichItem.tsx b/packages/shared-components/src/core/rich-list/RichItem/RichItem.tsx
similarity index 98%
rename from packages/shared-components/src/rich-list/RichItem/RichItem.tsx
rename to packages/shared-components/src/core/rich-list/RichItem/RichItem.tsx
index 9aeff4c924..589f0e7d89 100644
--- a/packages/shared-components/src/rich-list/RichItem/RichItem.tsx
+++ b/packages/shared-components/src/core/rich-list/RichItem/RichItem.tsx
@@ -10,7 +10,7 @@ import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check"
 
 import styles from "./RichItem.module.css";
 import { Flex } from "../../utils/Flex";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../i18n/i18nContext";
 
 export interface RichItemProps extends HTMLAttributes<HTMLLIElement> {
     /**
diff --git a/packages/shared-components/src/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap b/packages/shared-components/src/core/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap
rename to packages/shared-components/src/core/rich-list/RichItem/__snapshots__/RichItem.test.tsx.snap
diff --git a/packages/shared-components/src/rich-list/RichItem/index.ts b/packages/shared-components/src/core/rich-list/RichItem/index.ts
similarity index 100%
rename from packages/shared-components/src/rich-list/RichItem/index.ts
rename to packages/shared-components/src/core/rich-list/RichItem/index.ts
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.module.css b/packages/shared-components/src/core/rich-list/RichList/RichList.module.css
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/RichList.module.css
rename to packages/shared-components/src/core/rich-list/RichList/RichList.module.css
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.stories.tsx b/packages/shared-components/src/core/rich-list/RichList/RichList.stories.tsx
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/RichList.stories.tsx
rename to packages/shared-components/src/core/rich-list/RichList/RichList.stories.tsx
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.test.tsx b/packages/shared-components/src/core/rich-list/RichList/RichList.test.tsx
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/RichList.test.tsx
rename to packages/shared-components/src/core/rich-list/RichList/RichList.test.tsx
diff --git a/packages/shared-components/src/rich-list/RichList/RichList.tsx b/packages/shared-components/src/core/rich-list/RichList/RichList.tsx
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/RichList.tsx
rename to packages/shared-components/src/core/rich-list/RichList/RichList.tsx
diff --git a/packages/shared-components/src/rich-list/RichList/__snapshots__/RichList.test.tsx.snap b/packages/shared-components/src/core/rich-list/RichList/__snapshots__/RichList.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/__snapshots__/RichList.test.tsx.snap
rename to packages/shared-components/src/core/rich-list/RichList/__snapshots__/RichList.test.tsx.snap
diff --git a/packages/shared-components/src/rich-list/RichList/index.ts b/packages/shared-components/src/core/rich-list/RichList/index.ts
similarity index 100%
rename from packages/shared-components/src/rich-list/RichList/index.ts
rename to packages/shared-components/src/core/rich-list/RichList/index.ts
diff --git a/packages/shared-components/src/utils/Box/Box.module.css b/packages/shared-components/src/core/utils/Box/Box.module.css
similarity index 100%
rename from packages/shared-components/src/utils/Box/Box.module.css
rename to packages/shared-components/src/core/utils/Box/Box.module.css
diff --git a/packages/shared-components/src/utils/Box/Box.tsx b/packages/shared-components/src/core/utils/Box/Box.tsx
similarity index 100%
rename from packages/shared-components/src/utils/Box/Box.tsx
rename to packages/shared-components/src/core/utils/Box/Box.tsx
diff --git a/packages/shared-components/src/utils/Box/index.ts b/packages/shared-components/src/core/utils/Box/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/Box/index.ts
rename to packages/shared-components/src/core/utils/Box/index.ts
diff --git a/packages/shared-components/src/utils/DateUtils.test.ts b/packages/shared-components/src/core/utils/DateUtils.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/DateUtils.test.ts
rename to packages/shared-components/src/core/utils/DateUtils.test.ts
diff --git a/packages/shared-components/src/utils/DateUtils.ts b/packages/shared-components/src/core/utils/DateUtils.ts
similarity index 100%
rename from packages/shared-components/src/utils/DateUtils.ts
rename to packages/shared-components/src/core/utils/DateUtils.ts
diff --git a/packages/shared-components/src/utils/Flex/Flex.module.css b/packages/shared-components/src/core/utils/Flex/Flex.module.css
similarity index 100%
rename from packages/shared-components/src/utils/Flex/Flex.module.css
rename to packages/shared-components/src/core/utils/Flex/Flex.module.css
diff --git a/packages/shared-components/src/utils/Flex/Flex.tsx b/packages/shared-components/src/core/utils/Flex/Flex.tsx
similarity index 100%
rename from packages/shared-components/src/utils/Flex/Flex.tsx
rename to packages/shared-components/src/core/utils/Flex/Flex.tsx
diff --git a/packages/shared-components/src/utils/Flex/index.ts b/packages/shared-components/src/core/utils/Flex/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/Flex/index.ts
rename to packages/shared-components/src/core/utils/Flex/index.ts
diff --git a/packages/shared-components/src/utils/FormattingUtils.stories.tsx b/packages/shared-components/src/core/utils/FormattingUtils.stories.tsx
similarity index 87%
rename from packages/shared-components/src/utils/FormattingUtils.stories.tsx
rename to packages/shared-components/src/core/utils/FormattingUtils.stories.tsx
index e3bd0040e3..e85be08e29 100644
--- a/packages/shared-components/src/utils/FormattingUtils.stories.tsx
+++ b/packages/shared-components/src/core/utils/FormattingUtils.stories.tsx
@@ -9,8 +9,8 @@ import React from "react";
 import { Markdown } from "@storybook/addon-docs/blocks";
 
 import type { Meta } from "@storybook/react-vite";
-import formatBytesDoc from "../../typedoc/functions/formatBytes.md?raw";
-import formatSecondsDoc from "../../typedoc/functions/formatSeconds.md?raw";
+import formatBytesDoc from "../../../typedoc/functions/formatBytes.md?raw";
+import formatSecondsDoc from "../../../typedoc/functions/formatSeconds.md?raw";
 
 const meta = {
     title: "utils/FormattingUtils",
diff --git a/packages/shared-components/src/utils/FormattingUtils.ts b/packages/shared-components/src/core/utils/FormattingUtils.ts
similarity index 100%
rename from packages/shared-components/src/utils/FormattingUtils.ts
rename to packages/shared-components/src/core/utils/FormattingUtils.ts
diff --git a/packages/shared-components/src/utils/LinkedText/LinkedText.module.css b/packages/shared-components/src/core/utils/LinkedText/LinkedText.module.css
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/LinkedText.module.css
rename to packages/shared-components/src/core/utils/LinkedText/LinkedText.module.css
diff --git a/packages/shared-components/src/utils/LinkedText/LinkedText.stories.tsx b/packages/shared-components/src/core/utils/LinkedText/LinkedText.stories.tsx
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/LinkedText.stories.tsx
rename to packages/shared-components/src/core/utils/LinkedText/LinkedText.stories.tsx
diff --git a/packages/shared-components/src/utils/LinkedText/LinkedText.test.tsx b/packages/shared-components/src/core/utils/LinkedText/LinkedText.test.tsx
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/LinkedText.test.tsx
rename to packages/shared-components/src/core/utils/LinkedText/LinkedText.test.tsx
diff --git a/packages/shared-components/src/utils/LinkedText/LinkedText.tsx b/packages/shared-components/src/core/utils/LinkedText/LinkedText.tsx
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/LinkedText.tsx
rename to packages/shared-components/src/core/utils/LinkedText/LinkedText.tsx
diff --git a/packages/shared-components/src/utils/LinkedText/LinkedTextContext.tsx b/packages/shared-components/src/core/utils/LinkedText/LinkedTextContext.tsx
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/LinkedTextContext.tsx
rename to packages/shared-components/src/core/utils/LinkedText/LinkedTextContext.tsx
diff --git a/packages/shared-components/src/utils/LinkedText/__snapshots__/LinkedText.test.tsx.snap b/packages/shared-components/src/core/utils/LinkedText/__snapshots__/LinkedText.test.tsx.snap
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/__snapshots__/LinkedText.test.tsx.snap
rename to packages/shared-components/src/core/utils/LinkedText/__snapshots__/LinkedText.test.tsx.snap
diff --git a/packages/shared-components/src/utils/LinkedText/index.ts b/packages/shared-components/src/core/utils/LinkedText/index.ts
similarity index 100%
rename from packages/shared-components/src/utils/LinkedText/index.ts
rename to packages/shared-components/src/core/utils/LinkedText/index.ts
diff --git a/packages/shared-components/src/utils/applyReplacerOnString.tsx b/packages/shared-components/src/core/utils/applyReplacerOnString.tsx
similarity index 100%
rename from packages/shared-components/src/utils/applyReplacerOnString.tsx
rename to packages/shared-components/src/core/utils/applyReplacerOnString.tsx
diff --git a/packages/shared-components/src/utils/humanize.stories.tsx b/packages/shared-components/src/core/utils/humanize.stories.tsx
similarity index 91%
rename from packages/shared-components/src/utils/humanize.stories.tsx
rename to packages/shared-components/src/core/utils/humanize.stories.tsx
index 6d5ba65440..6b3c294ee3 100644
--- a/packages/shared-components/src/utils/humanize.stories.tsx
+++ b/packages/shared-components/src/core/utils/humanize.stories.tsx
@@ -9,7 +9,7 @@ import React from "react";
 import { Markdown } from "@storybook/addon-docs/blocks";
 
 import type { Meta } from "@storybook/react-vite";
-import humanizeTimeDoc from "../../typedoc/functions/humanizeTime.md?raw";
+import humanizeTimeDoc from "../../../typedoc/functions/humanizeTime.md?raw";
 
 const meta = {
     title: "utils/humanize",
diff --git a/packages/shared-components/src/utils/humanize.test.ts b/packages/shared-components/src/core/utils/humanize.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/humanize.test.ts
rename to packages/shared-components/src/core/utils/humanize.test.ts
diff --git a/packages/shared-components/src/utils/humanize.ts b/packages/shared-components/src/core/utils/humanize.ts
similarity index 97%
rename from packages/shared-components/src/utils/humanize.ts
rename to packages/shared-components/src/core/utils/humanize.ts
index b5953c9154..a5db5f7294 100644
--- a/packages/shared-components/src/utils/humanize.ts
+++ b/packages/shared-components/src/core/utils/humanize.ts
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { type I18nApi } from "@element-hq/element-web-module-api";
 
-import { _t as _tFromModule } from "./i18n";
+import { _t as _tFromModule } from "../i18n/i18n";
 
 // These are the constants we use for when to break the text
 const MILLISECONDS_RECENT = 15000;
diff --git a/packages/shared-components/src/utils/linkify.stories.tsx b/packages/shared-components/src/core/utils/linkify.stories.tsx
similarity index 72%
rename from packages/shared-components/src/utils/linkify.stories.tsx
rename to packages/shared-components/src/core/utils/linkify.stories.tsx
index 7a20615e5b..fbba0be228 100644
--- a/packages/shared-components/src/utils/linkify.stories.tsx
+++ b/packages/shared-components/src/core/utils/linkify.stories.tsx
@@ -9,13 +9,13 @@ import React from "react";
 import { Markdown } from "@storybook/addon-docs/blocks";
 
 import type { Meta } from "@storybook/react-vite";
-import LinkifyMatrixOpaqueIdType from "../../typedoc/enumerations/LinkifyMatrixOpaqueIdType.md?raw";
-import findLinksInString from "../../typedoc/functions/findLinksInString.md?raw";
-import isLinkable from "../../typedoc/functions/isLinkable.md?raw";
-import linkifyHtml from "../../typedoc/functions/linkifyHtml.md?raw";
-import linkifyString from "../../typedoc/functions/linkifyString.md?raw";
-import generateLinkedTextOptions from "../../typedoc/functions/generateLinkedTextOptions.md?raw";
-import LinkedTextOptions from "../../typedoc/interfaces/LinkedTextOptions.md?raw";
+import LinkifyMatrixOpaqueIdType from "../../../typedoc/enumerations/LinkifyMatrixOpaqueIdType.md?raw";
+import findLinksInString from "../../../typedoc/functions/findLinksInString.md?raw";
+import isLinkable from "../../../typedoc/functions/isLinkable.md?raw";
+import linkifyHtml from "../../../typedoc/functions/linkifyHtml.md?raw";
+import linkifyString from "../../../typedoc/functions/linkifyString.md?raw";
+import generateLinkedTextOptions from "../../../typedoc/functions/generateLinkedTextOptions.md?raw";
+import LinkedTextOptions from "../../../typedoc/interfaces/LinkedTextOptions.md?raw";
 
 const meta = {
     title: "utils/linkify",
diff --git a/packages/shared-components/src/utils/linkify.test.ts b/packages/shared-components/src/core/utils/linkify.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/linkify.test.ts
rename to packages/shared-components/src/core/utils/linkify.test.ts
diff --git a/packages/shared-components/src/utils/linkify.ts b/packages/shared-components/src/core/utils/linkify.ts
similarity index 100%
rename from packages/shared-components/src/utils/linkify.ts
rename to packages/shared-components/src/core/utils/linkify.ts
diff --git a/packages/shared-components/src/utils/numbers.stories.tsx b/packages/shared-components/src/core/utils/numbers.stories.tsx
similarity index 81%
rename from packages/shared-components/src/utils/numbers.stories.tsx
rename to packages/shared-components/src/core/utils/numbers.stories.tsx
index 638f8fe4ed..72cd7c5ce4 100644
--- a/packages/shared-components/src/utils/numbers.stories.tsx
+++ b/packages/shared-components/src/core/utils/numbers.stories.tsx
@@ -9,11 +9,11 @@ import React from "react";
 import { Markdown } from "@storybook/addon-docs/blocks";
 
 import type { Meta } from "@storybook/react-vite";
-import clampDoc from "../../typedoc/functions/clamp.md?raw";
-import defaultNumberDoc from "../../typedoc/functions/defaultNumber.md?raw";
-import percentageOfDoc from "../../typedoc/functions/percentageOf.md?raw";
-import percentageWithinDoc from "../../typedoc/functions/percentageWithin.md?raw";
-import sumDoc from "../../typedoc/functions/sum.md?raw";
+import clampDoc from "../../../typedoc/functions/clamp.md?raw";
+import defaultNumberDoc from "../../../typedoc/functions/defaultNumber.md?raw";
+import percentageOfDoc from "../../../typedoc/functions/percentageOf.md?raw";
+import percentageWithinDoc from "../../../typedoc/functions/percentageWithin.md?raw";
+import sumDoc from "../../../typedoc/functions/sum.md?raw";
 
 const meta = {
     title: "utils/numbers",
diff --git a/packages/shared-components/src/utils/numbers.test.ts b/packages/shared-components/src/core/utils/numbers.test.ts
similarity index 100%
rename from packages/shared-components/src/utils/numbers.test.ts
rename to packages/shared-components/src/core/utils/numbers.test.ts
diff --git a/packages/shared-components/src/utils/numbers.ts b/packages/shared-components/src/core/utils/numbers.ts
similarity index 100%
rename from packages/shared-components/src/utils/numbers.ts
rename to packages/shared-components/src/core/utils/numbers.ts
diff --git a/packages/shared-components/src/viewmodel/BaseViewModel.ts b/packages/shared-components/src/core/viewmodel/BaseViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/BaseViewModel.ts
rename to packages/shared-components/src/core/viewmodel/BaseViewModel.ts
diff --git a/packages/shared-components/src/viewmodel/Disposables.ts b/packages/shared-components/src/core/viewmodel/Disposables.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/Disposables.ts
rename to packages/shared-components/src/core/viewmodel/Disposables.ts
diff --git a/packages/shared-components/src/viewmodel/MockViewModel.ts b/packages/shared-components/src/core/viewmodel/MockViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/MockViewModel.ts
rename to packages/shared-components/src/core/viewmodel/MockViewModel.ts
diff --git a/packages/shared-components/src/viewmodel/Snapshot.ts b/packages/shared-components/src/core/viewmodel/Snapshot.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/Snapshot.ts
rename to packages/shared-components/src/core/viewmodel/Snapshot.ts
diff --git a/packages/shared-components/src/viewmodel/ViewModel.ts b/packages/shared-components/src/core/viewmodel/ViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/ViewModel.ts
rename to packages/shared-components/src/core/viewmodel/ViewModel.ts
diff --git a/packages/shared-components/src/viewmodel/ViewModelSubscriptions.ts b/packages/shared-components/src/core/viewmodel/ViewModelSubscriptions.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/ViewModelSubscriptions.ts
rename to packages/shared-components/src/core/viewmodel/ViewModelSubscriptions.ts
diff --git a/packages/shared-components/src/viewmodel/index.ts b/packages/shared-components/src/core/viewmodel/index.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/index.ts
rename to packages/shared-components/src/core/viewmodel/index.ts
diff --git a/packages/shared-components/src/viewmodel/tests/Disposables.test.ts b/packages/shared-components/src/core/viewmodel/tests/Disposables.test.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/tests/Disposables.test.ts
rename to packages/shared-components/src/core/viewmodel/tests/Disposables.test.ts
diff --git a/packages/shared-components/src/viewmodel/tests/Snapshot.test.ts b/packages/shared-components/src/core/viewmodel/tests/Snapshot.test.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/tests/Snapshot.test.ts
rename to packages/shared-components/src/core/viewmodel/tests/Snapshot.test.ts
diff --git a/packages/shared-components/src/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts b/packages/shared-components/src/core/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts
rename to packages/shared-components/src/core/viewmodel/tests/useCreateAutoDisposedViewModel.test.ts
diff --git a/packages/shared-components/src/viewmodel/useCreateAutoDisposedViewModel.ts b/packages/shared-components/src/core/viewmodel/useCreateAutoDisposedViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/useCreateAutoDisposedViewModel.ts
rename to packages/shared-components/src/core/viewmodel/useCreateAutoDisposedViewModel.ts
diff --git a/packages/shared-components/src/viewmodel/useMockedViewModel.ts b/packages/shared-components/src/core/viewmodel/useMockedViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/useMockedViewModel.ts
rename to packages/shared-components/src/core/viewmodel/useMockedViewModel.ts
diff --git a/packages/shared-components/src/viewmodel/useViewModel.ts b/packages/shared-components/src/core/viewmodel/useViewModel.ts
similarity index 100%
rename from packages/shared-components/src/viewmodel/useViewModel.ts
rename to packages/shared-components/src/core/viewmodel/useViewModel.ts
diff --git a/packages/shared-components/src/crypto/SasEmoji/SasEmoji.tsx b/packages/shared-components/src/crypto/SasEmoji/SasEmoji.tsx
index 6701cb37c9..bc9ae90185 100644
--- a/packages/shared-components/src/crypto/SasEmoji/SasEmoji.tsx
+++ b/packages/shared-components/src/crypto/SasEmoji/SasEmoji.tsx
@@ -10,7 +10,7 @@ import classNames from "classnames";
 
 import { type SasEmoji, tEmoji } from "./SasEmojiTranslate.ts";
 import styles from "./SasEmoji.module.css";
-import { useI18n } from "../../utils/i18nContext.ts";
+import { useI18n } from "../../core/i18n/i18nContext.ts";
 
 export type Props = {
     /**
diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx
index 83d472dcb6..db08c1387d 100644
--- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx
+++ b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx
@@ -9,7 +9,7 @@ import React, { type JSX } from "react";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { EncryptionEventView, EncryptionEventState, type EncryptionEventViewSnapshot } from "./EncryptionEventView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type EncryptionEventProps = EncryptionEventViewSnapshot;
diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx
index f71b07f99b..d867b306e1 100644
--- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx
+++ b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx
@@ -12,7 +12,7 @@ import React from "react";
 
 import { EncryptionEventState, EncryptionEventView } from "./EncryptionEventView";
 import * as stories from "./EncryptionEventView.stories";
-import { MockViewModel } from "../../viewmodel";
+import { MockViewModel } from "../../core/viewmodel";
 
 const {
     Default,
diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx
index afa7eb8356..07e92b6b28 100644
--- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx
+++ b/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx
@@ -9,9 +9,9 @@ import React, { type JSX } from "react";
 import { LockSolidIcon, ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import classNames from "classnames";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import styles from "./EncryptionEventView.module.css";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../core/i18n/i18nContext";
 import { EventTileBubble } from "../EventTileBubble";
 
 export enum EncryptionEventState {
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx
index 501da92dc6..ba4cd01693 100644
--- a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx
+++ b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import { type Meta, type StoryObj } from "@storybook/react-vite";
 
 import { TextualEventView as TextualEventComponent } from "./TextualEventView";
-import { MockViewModel } from "../../viewmodel/MockViewModel";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel";
 
 const meta = {
     title: "Event/TextualEvent",
diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx
index d08bfb0adb..63c7a602fc 100644
--- a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx
+++ b/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type ReactNode, type JSX } from "react";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 
 export type TextualEventViewSnapshot = {
     content: string | ReactNode;
diff --git a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
index 3d428add00..de02feefdd 100644
--- a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
+++ b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
@@ -11,7 +11,7 @@ import { fn } from "storybook/test";
 import type { Meta, StoryFn } from "@storybook/react-vite";
 import imageFile from "../../../../static/element.png";
 import { LinkPreview } from "./LinkPreview";
-import { LinkedTextContext } from "../../../utils/LinkedText";
+import { LinkedTextContext } from "../../../core/utils/LinkedText";
 
 export default {
     title: "Event/UrlPreviewGroupView/LinkPreview",
diff --git a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
index 33bbd71646..4aef86ca32 100644
--- a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
+++ b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
@@ -9,10 +9,10 @@ import React, { type MouseEventHandler, type JSX, useCallback, useMemo } from "r
 import { Tooltip, Text } from "@vector-im/compound-web";
 import classNames from "classnames";
 
-import { useI18n } from "../../../utils/i18nContext";
+import { useI18n } from "../../../core/i18n/i18nContext";
 import styles from "./LinkPreview.module.css";
 import type { UrlPreview } from "../types";
-import { LinkedText } from "../../../utils/LinkedText";
+import { LinkedText } from "../../../core/utils/LinkedText";
 
 export interface LinkPreviewActions {
     onImageClick: () => void;
diff --git a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx
index 36ef79eec2..9a07b08098 100644
--- a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx
+++ b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx
@@ -16,8 +16,8 @@ import {
     type UrlPreviewGroupViewActions,
     type UrlPreviewGroupViewSnapshot,
 } from "./UrlPreviewGroupView";
-import { useMockedViewModel } from "../../viewmodel";
-import { LinkedTextContext } from "../../utils/LinkedText";
+import { useMockedViewModel } from "../../core/viewmodel";
+import { LinkedTextContext } from "../../core/utils/LinkedText";
 
 type UrlPreviewGroupViewProps = UrlPreviewGroupViewSnapshot & UrlPreviewGroupViewActions;
 
diff --git a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.tsx b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.tsx
index 682c0717a3..8adc982f91 100644
--- a/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.tsx
+++ b/packages/shared-components/src/event-tiles/UrlPreviewGroupView/UrlPreviewGroupView.tsx
@@ -10,8 +10,8 @@ import { Button, IconButton } from "@vector-im/compound-web";
 import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
 import classNames from "classnames";
 
-import { useViewModel, type ViewModel } from "../../viewmodel";
-import { useI18n } from "../../utils/i18nContext";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
+import { useI18n } from "../../core/i18n/i18nContext";
 import type { UrlPreview } from "./types";
 import { LinkPreview } from "./LinkPreview";
 import styles from "./UrlPreviewGroupView.module.css";
diff --git a/packages/shared-components/src/index.ts b/packages/shared-components/src/index.ts
index a1e299e6d2..a638de3a3c 100644
--- a/packages/shared-components/src/index.ts
+++ b/packages/shared-components/src/index.ts
@@ -10,7 +10,7 @@ export * from "./audio/AudioPlayerView";
 export * from "./audio/Clock";
 export * from "./audio/PlayPauseButton";
 export * from "./audio/SeekBar";
-export * from "./avatar/AvatarWithDetails";
+export * from "./core/avatar/AvatarWithDetails";
 export * from "./composer/Banner";
 export * from "./crypto/SasEmoji";
 export * from "./event-tiles/EncryptionEventView";
@@ -28,14 +28,14 @@ export * from "./message-body/ReactionsRowButtonTooltip";
 export * from "./message-body/ReactionsRowButton";
 export * from "./message-body/ReactionsRow";
 export * from "./message-body/TimelineSeparator/";
-export * from "./pill-input/Pill";
-export * from "./pill-input/PillInput";
+export * from "./core/pill-input/Pill";
+export * from "./core/pill-input/PillInput";
 export * from "./room/RoomStatusBar";
 export * from "./room/WidgetPip";
 export * from "./profile/DisambiguatedProfile";
 export * from "./room/HistoryVisibilityBadge";
-export * from "./rich-list/RichItem";
-export * from "./rich-list/RichList";
+export * from "./core/rich-list/RichItem";
+export * from "./core/rich-list/RichList";
 export * from "./room-list/RoomListHeaderView";
 export * from "./room-list/RoomListSearchView";
 export * from "./room-list/RoomListSectionHeaderView";
@@ -45,21 +45,21 @@ export * from "./room-list/RoomListItemAccessibilityWrapper";
 export * from "./room-list/RoomListPrimaryFilters";
 export * from "./room-list/VirtualizedRoomListView";
 export * from "./timeline/DateSeparatorView/";
-export * from "./utils/Box";
-export * from "./utils/Flex";
-export * from "./utils/LinkedText";
+export * from "./core/utils/Box";
+export * from "./core/utils/Flex";
+export * from "./core/utils/LinkedText";
 export * from "./right-panel/WidgetContextMenu";
-export * from "./utils/VirtualizedList";
+export * from "./core/VirtualizedList";
 export * from "./resize";
 
 // Utils
-export * from "./utils/i18n";
-export * from "./utils/i18nContext";
-export * from "./utils/humanize";
-export * from "./utils/DateUtils";
-export * from "./utils/numbers";
-export * from "./utils/FormattingUtils";
-export * from "./utils/I18nApi";
-export * from "./utils/linkify";
+export * from "./core/i18n/i18n";
+export * from "./core/i18n/i18nContext";
+export * from "./core/utils/humanize";
+export * from "./core/utils/DateUtils";
+export * from "./core/utils/numbers";
+export * from "./core/utils/FormattingUtils";
+export * from "./core/i18n/I18nApi";
+export * from "./core/utils/linkify";
 // MVVM
-export * from "./viewmodel";
+export * from "./core/viewmodel";
diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx
index 3facdd6218..f9d9245ad2 100644
--- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx
+++ b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx
@@ -13,7 +13,7 @@ import {
     DecryptionFailureReason,
     type DecryptionFailureBodyViewSnapshot,
 } from "./DecryptionFailureBodyView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type DecryptionFailureBodyProps = DecryptionFailureBodyViewSnapshot;
diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx
index 6b275520c6..676a3f3079 100644
--- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx
+++ b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx
@@ -10,7 +10,7 @@ import React from "react";
 import { describe, it, expect } from "vitest";
 
 import { DecryptionFailureBodyView, DecryptionFailureReason } from "./DecryptionFailureBodyView";
-import { MockViewModel } from "../../viewmodel";
+import { MockViewModel } from "../../core/viewmodel";
 
 describe("DecryptionFailureBodyView", () => {
     function customRender(
diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx
index a3f99e1ac6..9c4370ce1d 100644
--- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx
+++ b/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx
@@ -10,10 +10,10 @@ import React, { type JSX } from "react";
 import { BlockIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import { type I18nApi } from "@element-hq/element-web-module-api";
 
-import { type ViewModel } from "../../viewmodel/ViewModel";
-import { useViewModel } from "../../viewmodel/useViewModel";
+import { type ViewModel } from "../../core/viewmodel/ViewModel";
+import { useViewModel } from "../../core/viewmodel/useViewModel";
 import styles from "./DecryptionFailureBodyView.module.css";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 /**
  * A reason code for a failure to decrypt an event.
diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx b/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx
index dacac25f57..d5db9ebd2c 100644
--- a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx
+++ b/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX } from "react";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { EventContentBodyView, type EventContentBodyViewSnapshot } from "./EventContentBodyView";
 import styles from "./EventContentBody.module.css";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx b/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx
index 1202882dc8..82460ce8d1 100644
--- a/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx
+++ b/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx
@@ -8,8 +8,8 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, memo, type Ref } from "react";
 import parse, { type HTMLReactParserOptions } from "html-react-parser";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
-import { applyReplacerOnString } from "../../utils/applyReplacerOnString";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
+import { applyReplacerOnString } from "../../core/utils/applyReplacerOnString";
 
 type Replacer = HTMLReactParserOptions["replace"];
 type ParseFormattedBody = (formattedBody: string, replacer?: Replacer) => ReturnType<typeof parse>;
diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx
index a9e5ff64e2..16713caba7 100644
--- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx
+++ b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx
@@ -16,7 +16,7 @@ import {
     type FileBodyViewActions,
     type FileBodyViewSnapshot,
 } from "./FileBodyView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type FileBodyViewProps = FileBodyViewSnapshot & FileBodyViewActions;
diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx
index 023a76af04..47640b04ff 100644
--- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx
+++ b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx
@@ -11,9 +11,9 @@ import { fireEvent, render, screen } from "@test-utils";
 import { describe, it, expect, vi } from "vitest";
 
 import { FileBodyView, FileBodyViewState, type FileBodyViewActions, type FileBodyViewSnapshot } from "./FileBodyView";
-import { MockViewModel } from "../../viewmodel/MockViewModel";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel";
 import { I18nApi } from "../../index";
-import { I18nContext } from "../../utils/i18nContext";
+import { I18nContext } from "../../core/i18n/i18nContext";
 import * as stories from "./FileBodyView.stories";
 
 const renderWithI18n = (ui: React.ReactElement): ReturnType<typeof render> =>
diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx
index ee9c51053d..2f325a45e5 100644
--- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx
+++ b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx
@@ -16,9 +16,9 @@ import {
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import styles from "./FileBodyView.module.css";
-import { type ViewModel } from "../../viewmodel/ViewModel";
-import { useViewModel } from "../../viewmodel/useViewModel";
-import { useI18n } from "../../utils/i18nContext";
+import { type ViewModel } from "../../core/viewmodel/ViewModel";
+import { useViewModel } from "../../core/viewmodel/useViewModel";
+import { useI18n } from "../../core/i18n/i18nContext";
 import { MediaBody } from "../MediaBody";
 
 /**
diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx
index 15cdf6e166..62d1f7f1ae 100644
--- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx
+++ b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx
@@ -14,7 +14,7 @@ import {
     type MessageTimestampViewActions,
     type MessageTimestampViewSnapshot,
 } from "./MessageTimestampView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type MessageTimestampProps = MessageTimestampViewSnapshot & MessageTimestampViewActions;
diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx
index f04d7d585e..a46fb738e4 100644
--- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx
+++ b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx
@@ -17,8 +17,8 @@ import {
     type MessageTimestampViewActions,
     type MessageTimestampViewSnapshot,
 } from "./MessageTimestampView";
-import { MockViewModel } from "../../viewmodel/MockViewModel.ts";
-import { I18nContext } from "../../utils/i18nContext.ts";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel.ts";
+import { I18nContext } from "../../core/i18n/i18nContext.ts";
 import { I18nApi } from "../../index.ts";
 
 const { Default, HasHref } = composeStories(stories);
diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx
index a60f68e882..d736a7bb42 100644
--- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx
+++ b/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx
@@ -10,9 +10,9 @@ import classNames from "classnames";
 import { Tooltip } from "@vector-im/compound-web";
 
 import styles from "./MessageTimestampView.module.css";
-import { type ViewModel } from "../../viewmodel/ViewModel";
-import { useViewModel } from "../../viewmodel/useViewModel";
-import { useI18n } from "../../utils/i18nContext";
+import { type ViewModel } from "../../core/viewmodel/ViewModel";
+import { useViewModel } from "../../core/viewmodel/useViewModel";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 export interface MessageTimestampViewSnapshot {
     /**
diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx b/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx
index 5d16397306..31d7af4264 100644
--- a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx
+++ b/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx
@@ -10,7 +10,7 @@ import classNames from "classnames";
 import PinIcon from "@vector-im/compound-design-tokens/assets/web/icons/pin-solid";
 
 import styles from "./PinnedMessageBadge.module.css";
-import { _t } from "../../utils/i18n";
+import { _t } from "../../core/i18n/i18n";
 
 export type PinnedMessageBadgeProps = HTMLAttributes<HTMLDivElement>;
 
diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx
index 88e5323aea..5dd8b54e19 100644
--- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx
@@ -10,7 +10,7 @@ import { fn } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { ReactionsRowButtonView } from "../ReactionsRowButton";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { ReactionsRowView, type ReactionsRowViewActions, type ReactionsRowViewSnapshot } from "./ReactionsRowView";
 
 interface MockReactionButtonProps {
diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx
index 2ca1c53281..620769b9c6 100644
--- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx
@@ -11,7 +11,7 @@ import React, { type MouseEventHandler } from "react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
-import { MockViewModel } from "../../viewmodel";
+import { MockViewModel } from "../../core/viewmodel";
 import {
     ReactionsRowView,
     type ReactionsRowViewActions,
diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx
index 379cf58857..f3f83fd186 100644
--- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx
@@ -10,7 +10,7 @@ import classNames from "classnames";
 import { ReactionAddIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import { Tooltip } from "@vector-im/compound-web";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import styles from "./ReactionsRow.module.css";
 
 export interface ReactionsRowViewSnapshot {
diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx b/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx
index 9a2a680c32..c180c594b8 100644
--- a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx
@@ -9,7 +9,7 @@ import React, { type JSX } from "react";
 import { fn } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { type ReactionsRowButtonTooltipViewSnapshot } from "../ReactionsRowButtonTooltip";
 import {
     ReactionsRowButtonView,
diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx b/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx
index a4ca3d18e5..9eaccd7be9 100644
--- a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx
@@ -8,7 +8,7 @@
 import React, { type HTMLAttributes, type JSX } from "react";
 import classNames from "classnames";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import { ReactionsRowButtonTooltipView, type ReactionsRowButtonTooltipViewModel } from "../ReactionsRowButtonTooltip";
 import styles from "./ReactionsRowButton.module.css";
 
diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx b/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx
index 4d5095e334..60a3ca3614 100644
--- a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx
@@ -8,7 +8,7 @@
 import React, { type JSX, type PropsWithChildren } from "react";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import {
     ReactionsRowButtonTooltipView,
diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx b/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx
index b8eb50f03c..a2a048fc45 100644
--- a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx
+++ b/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx
@@ -9,7 +9,7 @@ import { type PropsWithChildren, type JSX } from "react";
 import React from "react";
 import { Tooltip } from "@vector-im/compound-web";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 
 /**
  * Snapshot interface for the ReactionsRowButtonTooltip view.
diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx
index c5d1590b93..04a148fddc 100644
--- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx
+++ b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx
@@ -9,7 +9,7 @@ import React, { type JSX } from "react";
 import { expect, userEvent, within } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import { RedactedBodyView, type RedactedBodyViewSnapshot } from "./RedactedBodyView";
 
diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx
index 990e8be638..84b08ed1f8 100644
--- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx
+++ b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx
@@ -11,7 +11,7 @@ import React from "react";
 import userEvent from "@testing-library/user-event";
 import { describe, expect, it } from "vitest";
 
-import { MockViewModel } from "../../viewmodel";
+import { MockViewModel } from "../../core/viewmodel";
 import { RedactedBodyView, type RedactedBodyViewModel, type RedactedBodyViewSnapshot } from "./RedactedBodyView";
 import * as stories from "./RedactedBodyView.stories";
 
diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx
index 304e325513..d4dae18765 100644
--- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx
+++ b/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx
@@ -10,8 +10,8 @@ import classNames from "classnames";
 import { DeleteIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import { Tooltip } from "@vector-im/compound-web";
 
-import { type ViewModel } from "../../viewmodel";
-import { useViewModel } from "../../viewmodel/useViewModel";
+import { type ViewModel } from "../../core/viewmodel";
+import { useViewModel } from "../../core/viewmodel/useViewModel";
 import styles from "./RedactedBodyView.module.css";
 
 export interface RedactedBodyViewSnapshot {
diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx
index d2409b21d0..16d8dc1fc1 100644
--- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx
+++ b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx
@@ -14,7 +14,7 @@ import {
     type DisambiguatedProfileViewSnapshot,
     type DisambiguatedProfileViewActions,
 } from "./DisambiguatedProfileView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type DisambiguatedProfileProps = DisambiguatedProfileViewSnapshot & DisambiguatedProfileViewActions;
diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx
index a27b879b52..d9f7a9bbf6 100644
--- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx
+++ b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx
@@ -18,7 +18,7 @@ import {
     type DisambiguatedProfileViewActions,
     type DisambiguatedProfileViewSnapshot,
 } from "./DisambiguatedProfileView";
-import { MockViewModel } from "../../viewmodel/MockViewModel";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel";
 
 const { Default, WithMxid, WithColorClass, Emphasized, WithTooltip, FullExample } = composeStories(stories);
 
diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx
index 81fdbac83b..b356020e76 100644
--- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx
+++ b/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx
@@ -8,7 +8,7 @@
 import React, { type JSX, type KeyboardEventHandler, type MouseEventHandler } from "react";
 import classNames from "classnames";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import styles from "./DisambiguatedProfile.module.css";
 
 /**
diff --git a/packages/shared-components/src/resize/group/GroupView.stories.tsx b/packages/shared-components/src/resize/group/GroupView.stories.tsx
index 132429d192..42c11c3668 100644
--- a/packages/shared-components/src/resize/group/GroupView.stories.tsx
+++ b/packages/shared-components/src/resize/group/GroupView.stories.tsx
@@ -10,9 +10,9 @@ import { fn } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { GroupView, type GroupViewActions, Panel, Separator } from "..";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 
 type GroupViewProps = GroupViewActions;
 
diff --git a/packages/shared-components/src/resize/group/GroupView.test.tsx b/packages/shared-components/src/resize/group/GroupView.test.tsx
index 5144ada618..bcf8aef7f5 100644
--- a/packages/shared-components/src/resize/group/GroupView.test.tsx
+++ b/packages/shared-components/src/resize/group/GroupView.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 
 import * as stories from "./GroupView.stories";
-import { BaseViewModel } from "../../viewmodel";
+import { BaseViewModel } from "../../core/viewmodel";
 import { GroupView, type GroupViewActions, Panel, Separator } from "..";
 
 const { Default } = composeStories(stories);
diff --git a/packages/shared-components/src/resize/group/GroupView.tsx b/packages/shared-components/src/resize/group/GroupView.tsx
index e685a5108e..bb7b377484 100644
--- a/packages/shared-components/src/resize/group/GroupView.tsx
+++ b/packages/shared-components/src/resize/group/GroupView.tsx
@@ -8,7 +8,7 @@
 import React, { type PropsWithChildren } from "react";
 import { Group, type Layout } from "react-resizable-panels";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import { LEFT_PANEL_ID } from "..";
 
 export interface GroupViewActions {
diff --git a/packages/shared-components/src/resize/panel/LeftResizablePanelView.stories.tsx b/packages/shared-components/src/resize/panel/LeftResizablePanelView.stories.tsx
index 2c6f583d2f..b3badd97be 100644
--- a/packages/shared-components/src/resize/panel/LeftResizablePanelView.stories.tsx
+++ b/packages/shared-components/src/resize/panel/LeftResizablePanelView.stories.tsx
@@ -17,9 +17,9 @@ import {
     type LeftResizablePanelViewActions,
     type ResizerViewSnapshot,
 } from "..";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 
 type LeftResizablePanelViewProps = ResizerViewSnapshot & LeftResizablePanelViewActions;
 
diff --git a/packages/shared-components/src/resize/panel/LeftResizablePanelView.test.tsx b/packages/shared-components/src/resize/panel/LeftResizablePanelView.test.tsx
index bb80654901..449bffe953 100644
--- a/packages/shared-components/src/resize/panel/LeftResizablePanelView.test.tsx
+++ b/packages/shared-components/src/resize/panel/LeftResizablePanelView.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect, vi } from "vitest";
 import userEvent from "@testing-library/user-event";
 
 import * as stories from "./LeftResizablePanelView.stories";
-import { BaseViewModel } from "../../viewmodel";
+import { BaseViewModel } from "../../core/viewmodel";
 import {
     ResizableGroup,
     LEFT_PANEL_ID,
diff --git a/packages/shared-components/src/resize/panel/LeftResizablePanelView.tsx b/packages/shared-components/src/resize/panel/LeftResizablePanelView.tsx
index 73bbed3c10..b2ab2fb62e 100644
--- a/packages/shared-components/src/resize/panel/LeftResizablePanelView.tsx
+++ b/packages/shared-components/src/resize/panel/LeftResizablePanelView.tsx
@@ -14,7 +14,7 @@ import {
     type PanelSize,
 } from "react-resizable-panels";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import { LEFT_PANEL_ID, type ResizerViewSnapshot } from "..";
 
 export interface LeftResizablePanelViewActions {
diff --git a/packages/shared-components/src/resize/separator/SeparatorView.stories.tsx b/packages/shared-components/src/resize/separator/SeparatorView.stories.tsx
index 1b37c58eba..a3366c591e 100644
--- a/packages/shared-components/src/resize/separator/SeparatorView.stories.tsx
+++ b/packages/shared-components/src/resize/separator/SeparatorView.stories.tsx
@@ -10,9 +10,9 @@ import { expect, fn } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { ResizableGroup, Panel, type ResizerViewSnapshot, SeparatorView, type SeparatorViewActions } from "..";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 
 type SeparatorViewProps = ResizerViewSnapshot & SeparatorViewActions;
 
diff --git a/packages/shared-components/src/resize/separator/SeparatorView.test.tsx b/packages/shared-components/src/resize/separator/SeparatorView.test.tsx
index eb6195c81f..1887acbb57 100644
--- a/packages/shared-components/src/resize/separator/SeparatorView.test.tsx
+++ b/packages/shared-components/src/resize/separator/SeparatorView.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect, vi } from "vitest";
 import { userEvent } from "vitest/browser";
 
 import * as stories from "./SeparatorView.stories";
-import { BaseViewModel } from "../../viewmodel";
+import { BaseViewModel } from "../../core/viewmodel";
 import { ResizableGroup, Panel, type ResizerViewSnapshot, SeparatorView, type SeparatorViewActions } from "..";
 
 const { Default, LeftPanelExpanded, KeyboardFocused } = composeStories(stories);
diff --git a/packages/shared-components/src/resize/separator/SeparatorView.tsx b/packages/shared-components/src/resize/separator/SeparatorView.tsx
index e857487d27..c77c38764a 100644
--- a/packages/shared-components/src/resize/separator/SeparatorView.tsx
+++ b/packages/shared-components/src/resize/separator/SeparatorView.tsx
@@ -11,10 +11,10 @@ import DragIcon from "@vector-im/compound-design-tokens/assets/web/icons/drag-li
 import classNames from "classnames";
 import { Tooltip } from "@vector-im/compound-web";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
 import styles from "./SeparatorView.module.css";
 import { type ResizerViewSnapshot } from "..";
-import { useI18n } from "../../utils/i18nContext";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 export interface SeparatorViewActions {
     /**
diff --git a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.stories.tsx b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.stories.tsx
index b397fd1200..6776d119be 100644
--- a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.stories.tsx
+++ b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.stories.tsx
@@ -16,7 +16,7 @@ import {
     type WidgetContextMenuViewSnapshot,
     WidgetContextMenuView,
 } from "./WidgetContextMenuView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type WidgetContextMenuViewModelProps = WidgetContextMenuViewSnapshot & WidgetContextMenuViewActions;
diff --git a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.test.tsx b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.test.tsx
index 78fbc2e9e1..231f77f856 100644
--- a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.test.tsx
+++ b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.test.tsx
@@ -19,9 +19,9 @@ import {
     WidgetContextMenuView,
 } from "./WidgetContextMenuView";
 import * as stories from "./WidgetContextMenuView.stories.tsx";
-import { MockViewModel } from "../../viewmodel/MockViewModel.ts";
-import { I18nApi } from "../../utils/I18nApi.ts";
-import { I18nContext } from "../../utils/i18nContext.ts";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel.ts";
+import { I18nApi } from "../../core/i18n/I18nApi.ts";
+import { I18nContext } from "../../core/i18n/i18nContext.ts";
 
 const { Default, OnlyBasicModification } = composeStories(stories);
 
diff --git a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.tsx b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.tsx
index 410bb6d7d9..0aadc64e20 100644
--- a/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.tsx
+++ b/packages/shared-components/src/right-panel/WidgetContextMenu/WidgetContextMenuView.tsx
@@ -9,9 +9,9 @@ import React, { type ReactNode, type JSX } from "react";
 import { IconButton, Menu, MenuItem } from "@vector-im/compound-web";
 import TriggerIcon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
 
-import { type ViewModel } from "../../viewmodel/ViewModel.ts";
-import { useI18n } from "../../utils/i18nContext.ts";
-import { useViewModel } from "../../viewmodel/useViewModel.ts";
+import { type ViewModel } from "../../core/viewmodel/ViewModel.ts";
+import { useI18n } from "../../core/i18n/i18nContext.ts";
+import { useViewModel } from "../../core/viewmodel/useViewModel.ts";
 
 export interface WidgetContextMenuViewSnapshot {
     /**
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.stories.tsx b/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.stories.tsx
index 591f24c0cf..35b5fd201b 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.stories.tsx
@@ -14,7 +14,7 @@ import {
     type RoomListHeaderViewActions,
     type RoomListHeaderViewSnapshot,
 } from "./RoomListHeaderView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import { defaultSnapshot } from "./default-snapshot";
 
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.tsx b/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.tsx
index ead33d7f81..2125ea9af2 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.tsx
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/RoomListHeaderView.tsx
@@ -9,9 +9,9 @@ import React, { type JSX } from "react";
 import { IconButton, H1 } from "@vector-im/compound-web";
 import ComposeIcon from "@vector-im/compound-design-tokens/assets/web/icons/compose";
 
-import { type ViewModel, useViewModel } from "../../viewmodel";
-import { Flex } from "../../utils/Flex";
-import { useI18n } from "../../utils/i18nContext";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
+import { Flex } from "../../core/utils/Flex";
+import { useI18n } from "../../core/i18n/i18nContext";
 import { ComposeMenuView, OptionMenuView, SpaceMenuView } from "./menu";
 import styles from "./RoomListHeaderView.module.css";
 
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/menu/ComposeMenuView.tsx b/packages/shared-components/src/room-list/RoomListHeaderView/menu/ComposeMenuView.tsx
index c7faf630ca..0e4a2f2b73 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/menu/ComposeMenuView.tsx
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/menu/ComposeMenuView.tsx
@@ -13,8 +13,8 @@ import ChatIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat";
 import RoomIcon from "@vector-im/compound-design-tokens/assets/web/icons/room";
 
 import { type RoomListHeaderViewModel } from "../RoomListHeaderView";
-import { useI18n } from "../../../utils/i18nContext";
-import { useViewModel } from "../../../viewmodel";
+import { useI18n } from "../../../core/i18n/i18nContext";
+import { useViewModel } from "../../../core/viewmodel";
 
 interface ComposeMenuViewProps {
     /**
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/menu/OptionMenuView.tsx b/packages/shared-components/src/room-list/RoomListHeaderView/menu/OptionMenuView.tsx
index 2447bf05f0..55e2bc29b8 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/menu/OptionMenuView.tsx
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/menu/OptionMenuView.tsx
@@ -10,8 +10,8 @@ import React, { type JSX, useState } from "react";
 import OverflowHorizontalIcon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
 
 import { type RoomListHeaderViewModel } from "../RoomListHeaderView";
-import { useViewModel } from "../../../viewmodel";
-import { useI18n } from "../../../utils/i18nContext";
+import { useViewModel } from "../../../core/viewmodel";
+import { useI18n } from "../../../core/i18n/i18nContext";
 import styles from "./OptionMenuView.module.css";
 
 interface OptionMenuViewProps {
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/menu/SpaceMenuView.tsx b/packages/shared-components/src/room-list/RoomListHeaderView/menu/SpaceMenuView.tsx
index 72d3d2521b..52869b3d53 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/menu/SpaceMenuView.tsx
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/menu/SpaceMenuView.tsx
@@ -14,8 +14,8 @@ import PreferencesIcon from "@vector-im/compound-design-tokens/assets/web/icons/
 import UserAddIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
 
 import styles from "./SpaceMenuView.module.css";
-import { useViewModel } from "../../../viewmodel";
-import { useI18n } from "../../../utils/i18nContext";
+import { useViewModel } from "../../../core/viewmodel";
+import { useI18n } from "../../../core/i18n/i18nContext";
 import { type RoomListHeaderViewModel } from "../RoomListHeaderView";
 
 interface SpaceMenuViewProps {
diff --git a/packages/shared-components/src/room-list/RoomListHeaderView/test-utils.ts b/packages/shared-components/src/room-list/RoomListHeaderView/test-utils.ts
index 467bfbb16f..661c534328 100644
--- a/packages/shared-components/src/room-list/RoomListHeaderView/test-utils.ts
+++ b/packages/shared-components/src/room-list/RoomListHeaderView/test-utils.ts
@@ -7,7 +7,7 @@
 
 import { vi } from "vitest";
 
-import { MockViewModel } from "../../viewmodel";
+import { MockViewModel } from "../../core/viewmodel";
 import { type RoomListHeaderViewActions, type RoomListHeaderViewSnapshot } from "./RoomListHeaderView";
 
 /**
diff --git a/packages/shared-components/src/room-list/RoomListItemAccessibilityWrapper/RoomListItemAccessibilityWrapper.tsx b/packages/shared-components/src/room-list/RoomListItemAccessibilityWrapper/RoomListItemAccessibilityWrapper.tsx
index d5ffddc863..1ea7ecf1fb 100644
--- a/packages/shared-components/src/room-list/RoomListItemAccessibilityWrapper/RoomListItemAccessibilityWrapper.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemAccessibilityWrapper/RoomListItemAccessibilityWrapper.tsx
@@ -8,7 +8,7 @@
 import React, { memo, type JSX } from "react";
 
 import { RoomListItemView, type RoomListItemViewProps } from "../RoomListItemView";
-import { getItemAccessibleProps } from "../../utils/VirtualizedList";
+import { getItemAccessibleProps } from "../../core/VirtualizedList";
 
 export interface RoomListItemAccessibilityWrapperPros extends RoomListItemViewProps {
     /** Index of this room in the list */
diff --git a/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx
index 03be962fbf..7a3e02722c 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/NotificationDecoration/NotificationDecoration.tsx
@@ -16,7 +16,7 @@ import {
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 import { UnreadCounter, Unread } from "@vector-im/compound-web";
 
-import { Flex } from "../../../utils/Flex";
+import { Flex } from "../../../core/utils/Flex";
 
 /**
  * Data representing the notification state for a room or item.
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx
index 17c44e4a0c..404162dc85 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemContextMenu.tsx
@@ -8,7 +8,7 @@
 import React, { type JSX, type PropsWithChildren } from "react";
 import { ContextMenu } from "@vector-im/compound-web";
 
-import { _t } from "../../utils/i18n";
+import { _t } from "../../core/i18n/i18n";
 import { MoreOptionContent, type RoomListItemViewModel } from "./RoomListItemMoreOptionsMenu";
 
 /**
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
index b46f72a6d6..6d0b5bf457 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemHoverMenu.tsx
@@ -7,7 +7,7 @@
 
 import React, { type JSX } from "react";
 
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 import { RoomListItemMoreOptionsMenu, type RoomListItemViewModel } from "./RoomListItemMoreOptionsMenu";
 import { RoomListItemNotificationMenu } from "./RoomListItemNotificationMenu";
 import styles from "./RoomListItemView.module.css";
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
index c3f491d261..7931bd7f07 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.test.tsx
@@ -11,7 +11,7 @@ import userEvent from "@testing-library/user-event";
 import { describe, it, expect, vi } from "vitest";
 
 import { RoomListItemMoreOptionsMenu } from "./RoomListItemMoreOptionsMenu";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import type { RoomListItemViewSnapshot } from "./RoomListItemView";
 import { defaultSnapshot } from "./default-snapshot";
 
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
index b5557e8834..9d638c84ff 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemMoreOptionsMenu.tsx
@@ -18,8 +18,8 @@ import {
     OverflowHorizontalIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { _t } from "../../utils/i18n";
-import { useViewModel, type ViewModel } from "../../viewmodel";
+import { _t } from "../../core/i18n/i18n";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
 import type { RoomListItemViewSnapshot, RoomListItemViewActions } from "./RoomListItemView";
 
 /**
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
index 4a47b6f436..b0c54f2a5b 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect, vi } from "vitest";
 
 import { RoomListItemNotificationMenu } from "./RoomListItemNotificationMenu";
 import { RoomNotifState } from "./RoomNotifs";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import type { RoomListItemViewSnapshot } from "./RoomListItemView";
 import { defaultSnapshot } from "./default-snapshot";
 
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
index 545993f3ee..4fdd404b8b 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemNotificationMenu.tsx
@@ -13,9 +13,9 @@ import {
     CheckIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { _t } from "../../utils/i18n";
+import { _t } from "../../core/i18n/i18n";
 import { RoomNotifState } from "./RoomNotifs";
-import { useViewModel, type ViewModel } from "../../viewmodel";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
 import type { RoomListItemViewSnapshot, RoomListItemViewActions } from "./RoomListItemView";
 
 /**
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
index 1682c3231e..c948c7f777 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.stories.tsx
@@ -11,7 +11,7 @@ import { fn } from "storybook/test";
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import type { Room } from "./RoomListItemView";
 import { RoomListItemView, type RoomListItemViewSnapshot, type RoomListItemViewActions } from "./RoomListItemView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import { defaultSnapshot } from "./default-snapshot";
 import { renderAvatar } from "../story-mocks";
diff --git a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
index 04e7238407..723986336a 100644
--- a/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
+++ b/packages/shared-components/src/room-list/RoomListItemView/RoomListItemView.tsx
@@ -9,14 +9,14 @@ import React, { type JSX, memo, useEffect, useRef, type ReactNode } from "react"
 import classNames from "classnames";
 import { Text } from "@vector-im/compound-web";
 
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 import { NotificationDecoration, type NotificationDecorationData } from "./NotificationDecoration";
 import { RoomListItemHoverMenu } from "./RoomListItemHoverMenu";
 import { RoomListItemContextMenu } from "./RoomListItemContextMenu";
 import { type RoomNotifState } from "./RoomNotifs";
 import styles from "./RoomListItemView.module.css";
-import { useViewModel, type ViewModel } from "../../viewmodel";
-import { _t } from "../../utils/i18n";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
+import { _t } from "../../core/i18n/i18n";
 
 /**
  * Opaque type representing a Room object from the parent application
diff --git a/packages/shared-components/src/room-list/RoomListPrimaryFilters/RoomListPrimaryFilters.tsx b/packages/shared-components/src/room-list/RoomListPrimaryFilters/RoomListPrimaryFilters.tsx
index bbc26692e3..5b325156b5 100644
--- a/packages/shared-components/src/room-list/RoomListPrimaryFilters/RoomListPrimaryFilters.tsx
+++ b/packages/shared-components/src/room-list/RoomListPrimaryFilters/RoomListPrimaryFilters.tsx
@@ -9,8 +9,8 @@ import React, { type JSX, memo, useId, useState } from "react";
 import { ChatFilter, IconButton } from "@vector-im/compound-web";
 import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down";
 
-import { Flex } from "../../utils/Flex";
-import { _t } from "../../utils/i18n";
+import { Flex } from "../../core/utils/Flex";
+import { _t } from "../../core/i18n/i18n";
 import { useCollapseFilters } from "./useCollapseFilters";
 import { useVisibleFilters, type FilterId } from "./useVisibleFilters";
 import styles from "./RoomListPrimaryFilters.module.css";
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx
index ff9578f2fb..18bd159dc7 100644
--- a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.stories.tsx
@@ -14,7 +14,7 @@ import {
     type RoomListSearchViewActions,
     type RoomListSearchViewSnapshot,
 } from "./RoomListSearchView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type RoomListSearchProps = RoomListSearchViewSnapshot & RoomListSearchViewActions;
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx
index 325d8516da..03b2aa7d55 100644
--- a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.test.tsx
@@ -17,7 +17,7 @@ import {
     type RoomListSearchViewActions,
     type RoomListSearchViewSnapshot,
 } from "./RoomListSearchView";
-import { MockViewModel } from "../../viewmodel/MockViewModel";
+import { MockViewModel } from "../../core/viewmodel/MockViewModel";
 
 const { Default, WithDialPad, WithoutExplore, AllButtons } = composeStories(stories);
 
diff --git a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx
index 7d45b09c29..f1fe73c0a0 100644
--- a/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx
+++ b/packages/shared-components/src/room-list/RoomListSearchView/RoomListSearchView.tsx
@@ -12,9 +12,9 @@ import SearchIcon from "@vector-im/compound-design-tokens/assets/web/icons/searc
 import DialPadIcon from "@vector-im/compound-design-tokens/assets/web/icons/dial-pad";
 
 import styles from "./RoomListSearchView.module.css";
-import { type ViewModel, useViewModel } from "../../viewmodel";
-import { Flex } from "../../utils/Flex";
-import { useI18n } from "../../utils/i18nContext";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
+import { Flex } from "../../core/utils/Flex";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 export interface RoomListSearchViewSnapshot {
     /**
diff --git a/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.stories.tsx b/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.stories.tsx
index 3f761a17c9..939cc3ee9d 100644
--- a/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.stories.tsx
@@ -15,7 +15,7 @@ import {
     type RoomListSectionHeaderActions,
     type RoomListSectionHeaderViewProps,
 } from "./RoomListSectionHeaderView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type RoomListSectionHeaderProps = RoomListSectionHeaderViewSnapshot &
diff --git a/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.tsx b/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.tsx
index 5008aa3870..326218d671 100644
--- a/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.tsx
+++ b/packages/shared-components/src/room-list/RoomListSectionHeaderView/RoomListSectionHeaderView.tsx
@@ -9,11 +9,11 @@ import React, { memo, type JSX, type FocusEvent, type MouseEventHandler } from "
 import ChevronRightIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-right";
 import classNames from "classnames";
 
-import { useViewModel, type ViewModel } from "../../viewmodel";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
 import styles from "./RoomListSectionHeaderView.module.css";
-import { Flex } from "../../utils/Flex";
-import { useI18n } from "../../utils/i18nContext";
-import { getGroupHeaderAccessibleProps } from "../../utils/VirtualizedList";
+import { Flex } from "../../core/utils/Flex";
+import { useI18n } from "../../core/i18n/i18nContext";
+import { getGroupHeaderAccessibleProps } from "../../core/VirtualizedList";
 
 /**
  * The observable state snapshot for a room list section header.
diff --git a/packages/shared-components/src/room-list/RoomListView/RoomListEmptyStateView.tsx b/packages/shared-components/src/room-list/RoomListView/RoomListEmptyStateView.tsx
index 12d26517b3..4b5fdd145a 100644
--- a/packages/shared-components/src/room-list/RoomListView/RoomListEmptyStateView.tsx
+++ b/packages/shared-components/src/room-list/RoomListView/RoomListEmptyStateView.tsx
@@ -10,9 +10,9 @@ import { Button } from "@vector-im/compound-web";
 import ChatIcon from "@vector-im/compound-design-tokens/assets/web/icons/chat";
 import RoomIcon from "@vector-im/compound-design-tokens/assets/web/icons/room";
 
-import { Flex } from "../../utils/Flex";
-import { _t } from "../../utils/i18n";
-import { useViewModel } from "../../viewmodel";
+import { Flex } from "../../core/utils/Flex";
+import { _t } from "../../core/i18n/i18n";
+import { useViewModel } from "../../core/viewmodel";
 import type { RoomListViewModel } from "./RoomListView";
 import styles from "./RoomListEmptyStateView.module.css";
 
diff --git a/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx b/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
index 7ac3439b87..ceae8c78ca 100644
--- a/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
+++ b/packages/shared-components/src/room-list/RoomListView/RoomListView.stories.tsx
@@ -12,7 +12,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import type { Room } from "../RoomListItemView";
 import type { FilterId } from "../RoomListPrimaryFilters";
 import { RoomListView, type RoomListViewSnapshot, type RoomListViewActions } from "./RoomListView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import {
     renderAvatar,
diff --git a/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx b/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
index eec6cc3aa3..8405c566af 100644
--- a/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
+++ b/packages/shared-components/src/room-list/RoomListView/RoomListView.tsx
@@ -7,7 +7,7 @@
 
 import React, { type JSX, type ReactNode } from "react";
 
-import { useViewModel, type ViewModel } from "../../viewmodel";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
 import { RoomListPrimaryFilters, type FilterId } from "../RoomListPrimaryFilters";
 import { RoomListLoadingSkeleton } from "./RoomListLoadingSkeleton";
 import { RoomListEmptyStateView } from "./RoomListEmptyStateView";
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
index c4b62480cc..942130acac 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.stories.tsx
@@ -12,7 +12,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import type { Room } from "../RoomListItemView";
 import { VirtualizedRoomListView, type RoomListViewState } from "./VirtualizedRoomListView";
 import type { RoomListViewSnapshot, RoomListViewActions } from "../RoomListView";
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import type { FilterId } from "../RoomListPrimaryFilters";
 import {
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
index 686018c137..3bc484ae03 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/VirtualizedRoomListView.tsx
@@ -10,15 +10,15 @@ import { type ScrollIntoViewLocation } from "react-virtuoso";
 import { isEqual } from "lodash";
 
 import { type Room } from "../RoomListItemView";
-import { useViewModel } from "../../viewmodel";
-import { _t } from "../../utils/i18n";
+import { useViewModel } from "../../core/viewmodel";
+import { _t } from "../../core/i18n/i18n";
 import {
     FlatVirtualizedList,
     getContainerAccessibleProps,
     type VirtualizedListContext,
-} from "../../utils/VirtualizedList";
+} from "../../core/VirtualizedList";
 import type { RoomListViewSnapshot, RoomListViewModel } from "../RoomListView";
-import { GroupedVirtualizedList } from "../../utils/VirtualizedList";
+import { GroupedVirtualizedList } from "../../core/VirtualizedList";
 import { RoomListSectionHeaderView } from "../RoomListSectionHeaderView";
 import { RoomListItemAccessibilityWrapper } from "../RoomListItemAccessibilityWrapper";
 
diff --git a/packages/shared-components/src/room-list/story-mocks.tsx b/packages/shared-components/src/room-list/story-mocks.tsx
index 4ef1b64fb9..bd4b2b6a90 100644
--- a/packages/shared-components/src/room-list/story-mocks.tsx
+++ b/packages/shared-components/src/room-list/story-mocks.tsx
@@ -15,7 +15,7 @@ import {
     RoomNotifState,
 } from "./RoomListItemView";
 import { type RoomListSectionHeaderViewModel } from "./RoomListSectionHeaderView";
-import { MockViewModel } from "../viewmodel";
+import { MockViewModel } from "../core/viewmodel";
 
 /**
  * Mock avatar component for stories
diff --git a/packages/shared-components/src/room/HistoryVisibilityBadge/HistoryVisibilityBadge.tsx b/packages/shared-components/src/room/HistoryVisibilityBadge/HistoryVisibilityBadge.tsx
index f03e69dd00..2961e36844 100644
--- a/packages/shared-components/src/room/HistoryVisibilityBadge/HistoryVisibilityBadge.tsx
+++ b/packages/shared-components/src/room/HistoryVisibilityBadge/HistoryVisibilityBadge.tsx
@@ -13,7 +13,7 @@ import {
     VisibilityOffIcon,
 } from "@vector-im/compound-design-tokens/assets/web/icons";
 
-import { _t } from "../../utils/i18n";
+import { _t } from "../../core/i18n/i18n";
 
 interface Props {
     /** The history visibility of the room, according to the room state. */
diff --git a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
index 4a891645c3..5b48baca88 100644
--- a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
+++ b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.stories.tsx
@@ -8,7 +8,7 @@ import { type Meta, type StoryObj } from "@storybook/react-vite";
 import React, { type JSX } from "react";
 import { fn } from "storybook/test";
 
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 import {
     RoomStatusBarState,
diff --git a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
index b5ed34f1db..4d9d79014a 100644
--- a/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
+++ b/packages/shared-components/src/room/RoomStatusBar/RoomStatusBarView.tsx
@@ -10,8 +10,8 @@ import { RestartIcon, DeleteIcon } from "@vector-im/compound-design-tokens/asset
 import { Button, InlineSpinner, Text } from "@vector-im/compound-web";
 
 import styles from "./RoomStatusBarView.module.css";
-import { type ViewModel, useViewModel } from "../../viewmodel";
-import { useI18n } from "../../utils/i18nContext";
+import { type ViewModel, useViewModel } from "../../core/viewmodel";
+import { useI18n } from "../../core/i18n/i18nContext";
 import { Banner } from "../../composer/Banner";
 export interface RoomStatusBarViewActions {
     /**
diff --git a/packages/shared-components/src/room/WidgetPip/WidgetPipView.stories.tsx b/packages/shared-components/src/room/WidgetPip/WidgetPipView.stories.tsx
index 8b94459304..8240afc94f 100644
--- a/packages/shared-components/src/room/WidgetPip/WidgetPipView.stories.tsx
+++ b/packages/shared-components/src/room/WidgetPip/WidgetPipView.stories.tsx
@@ -9,7 +9,7 @@ import { type Meta, type StoryFn } from "@storybook/react-vite";
 import React, { type JSX } from "react";
 import { fn } from "storybook/test";
 
-import { useMockedViewModel } from "../../viewmodel";
+import { useMockedViewModel } from "../../core/viewmodel";
 import { WidgetPipView, type WidgetPipViewActions, type WidgetPipViewSnapshot } from "./WidgetPipView";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
diff --git a/packages/shared-components/src/room/WidgetPip/WidgetPipView.tsx b/packages/shared-components/src/room/WidgetPip/WidgetPipView.tsx
index aa874fad51..da0e3c5256 100644
--- a/packages/shared-components/src/room/WidgetPip/WidgetPipView.tsx
+++ b/packages/shared-components/src/room/WidgetPip/WidgetPipView.tsx
@@ -10,7 +10,7 @@ import { ChevronLeftIcon } from "@vector-im/compound-design-tokens/assets/web/ic
 import { IconButton } from "@vector-im/compound-web";
 
 import styles from "./WidgetPipView.module.css";
-import { useViewModel, type ViewModel } from "../../viewmodel";
+import { useViewModel, type ViewModel } from "../../core/viewmodel";
 import { useI18n } from "../..";
 
 export interface WidgetPipViewActions {
diff --git a/packages/shared-components/src/test/setupTests.ts b/packages/shared-components/src/test/setupTests.ts
index 9b048d272b..614dd85da3 100644
--- a/packages/shared-components/src/test/setupTests.ts
+++ b/packages/shared-components/src/test/setupTests.ts
@@ -9,7 +9,7 @@ import fetchMock from "@fetch-mock/vitest";
 import { cleanup } from "@test-utils";
 import { afterEach } from "vitest";
 
-import { setLanguage } from "../../src/utils/i18n";
+import { setLanguage } from "../../src/core/i18n/i18n";
 import en from "../i18n/strings/en_EN.json";
 
 function setupLanguageMock(): void {
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx
index 44fd099b52..6ee1951358 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx
@@ -9,8 +9,8 @@ import React from "react";
 import { Tooltip } from "@vector-im/compound-web";
 import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down";
 
-import { Flex } from "../../utils/Flex";
-import { useI18n } from "../../utils/i18nContext";
+import { Flex } from "../../core/utils/Flex";
+import { useI18n } from "../../core/i18n/i18nContext";
 
 /** Props for DateSeparatorButton. */
 export interface DateSeparatorButtonProps {
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx
index 9cd2086ea1..1f51f6c412 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx
@@ -9,8 +9,8 @@ import React, { type JSX, type PropsWithChildren, useRef } from "react";
 import { Menu, MenuItem, Separator } from "@vector-im/compound-web";
 import { capitalize } from "lodash";
 
-import { useI18n } from "../../utils/i18nContext";
-import { humanizeRelativeTime } from "../../utils/humanize";
+import { useI18n } from "../../core/i18n/i18nContext";
+import { humanizeRelativeTime } from "../../core/utils/humanize";
 import { type DateSeparatorViewModel } from "./DateSeparatorView";
 import { DateSeparatorDatePickerView } from "./DateSeparatorDatePickerView";
 import styles from "./DateSeparatorContextMenuView.module.css";
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx
index 6c6409a8ee..1c033a5659 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx
@@ -8,9 +8,9 @@
 import React, { type JSX, useId, useRef, useState } from "react";
 import { Root, Submit, Field, TextControl, MenuItem } from "@vector-im/compound-web";
 
-import { formatDateForInput } from "../../utils/DateUtils";
-import { useI18n } from "../../utils/i18nContext";
-import { useViewModel } from "../../viewmodel";
+import { formatDateForInput } from "../../core/utils/DateUtils";
+import { useI18n } from "../../core/i18n/i18nContext";
+import { useViewModel } from "../../core/viewmodel";
 import { type DateSeparatorViewModel } from "./DateSeparatorView";
 import styles from "./DateSeparatorDatePickerView.module.css";
 
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx
index b7e14bca05..da21a98315 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx
@@ -10,7 +10,7 @@ import { expect, userEvent, within } from "storybook/test";
 
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { DateSeparatorView, type DateSeparatorViewSnapshot, type DateSeparatorViewActions } from "./DateSeparatorView";
-import { useMockedViewModel } from "../../viewmodel/useMockedViewModel";
+import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel";
 import { withViewDocs } from "../../../.storybook/withViewDocs";
 
 type DateSeparatorProps = DateSeparatorViewSnapshot & DateSeparatorViewActions;
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx
index 97586f5e61..7b901ef633 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx
@@ -12,7 +12,7 @@ import { describe, it, expect } from "vitest";
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 
-import { BaseViewModel } from "../../viewmodel/BaseViewModel";
+import { BaseViewModel } from "../../core/viewmodel/BaseViewModel";
 import { DateSeparatorView, type DateSeparatorViewModel, type DateSeparatorViewSnapshot } from "./DateSeparatorView";
 import * as stories from "./DateSeparatorView.stories";
 
diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx
index 4d2c21cd96..0c9ba864ca 100644
--- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx
+++ b/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx
@@ -8,10 +8,10 @@
 import classNames from "classnames";
 import React, { type JSX, useState } from "react";
 
-import { type ViewModel } from "../../viewmodel/ViewModel";
-import { useViewModel } from "../../viewmodel/useViewModel";
+import { type ViewModel } from "../../core/viewmodel/ViewModel";
+import { useViewModel } from "../../core/viewmodel/useViewModel";
 import styles from "./DateSeparatorView.module.css";
-import { Flex } from "../../utils/Flex";
+import { Flex } from "../../core/utils/Flex";
 import { TimelineSeparator } from "../../message-body/TimelineSeparator";
 import { DateSeparatorContextMenuView } from "./DateSeparatorContextMenuView";
 import { DateSeparatorButton } from "./DateSeparatorButton";