diff --git a/webui/src/features/campaigns/GlobalSettingsPage.tsx b/webui/src/features/campaigns/GlobalSettingsPage.tsx
index cfb2e0c..0e31e23 100644
--- a/webui/src/features/campaigns/GlobalSettingsPage.tsx
+++ b/webui/src/features/campaigns/GlobalSettingsPage.tsx
@@ -13,7 +13,7 @@ import CampaignAccessCard from "./components/CampaignAccessCard";
 import VersionLine from "./components/VersionLine";
 import { ToggleSwitch } from "@govoplan/core-webui";
 import { hasScope } from "@govoplan/core-webui";
-import { RetentionPolicyEditor } from "../privacy/RetentionPolicyManagement";
+import { RetentionPolicyEditor } from "@govoplan/core-webui";
 import { useCampaignWorkspaceData } from "./hooks/useCampaignWorkspaceData";
 import { useCampaignDraftEditor } from "./hooks/useCampaignDraftEditor";
 import { asRecord, isAuditLockedVersion } from "./utils/campaignView";
diff --git a/webui/src/features/privacy/RetentionPolicyManagement.tsx b/webui/src/features/privacy/RetentionPolicyManagement.tsx
deleted file mode 100644
index e88854e..0000000
--- a/webui/src/features/privacy/RetentionPolicyManagement.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export { RetentionPolicyEditor, RetentionPolicyScopeManager } from "@govoplan/core-webui";
-export type { RetentionPolicyTargetOption } from "@govoplan/core-webui";
diff --git a/webui/src/features/templates/TemplatesPage.tsx b/webui/src/features/templates/TemplatesPage.tsx
index 51b139b..d9b15d7 100644
--- a/webui/src/features/templates/TemplatesPage.tsx
+++ b/webui/src/features/templates/TemplatesPage.tsx
@@ -6,7 +6,7 @@ import { PageTitle } from "@govoplan/core-webui";
 import { FieldLabel } from "@govoplan/core-webui";
 import { StatusBadge, TableActionGroup, i18nMessage } from "@govoplan/core-webui";
 import { usePlatformLanguage } from "@govoplan/core-webui";
-import ModuleSubnav, { type ModuleSubnavGroup } from "../../layout/ModuleSubnav";
+import { ModuleSubnav, type ModuleSubnavGroup } from "@govoplan/core-webui";
 import { DataGrid, type DataGridColumn } from "@govoplan/core-webui";
 
 type TemplateRecord = {
diff --git a/webui/src/layout/ModuleSubnav.tsx b/webui/src/layout/ModuleSubnav.tsx
deleted file mode 100644
index ca3cfc3..0000000
--- a/webui/src/layout/ModuleSubnav.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { ModuleSubnav } from "@govoplan/core-webui";
-
-export type { ModuleSubnavGroup, ModuleSubnavItem } from "@govoplan/core-webui";
-export default ModuleSubnav;
diff --git a/webui/src/layout/SectionSidebar.tsx b/webui/src/layout/SectionSidebar.tsx
index 5200d03..7805cca 100644
--- a/webui/src/layout/SectionSidebar.tsx
+++ b/webui/src/layout/SectionSidebar.tsx
@@ -1,5 +1,5 @@
 import type { CampaignWorkspaceSection } from "../types";
-import ModuleSubnav, { type ModuleSubnavGroup } from "./ModuleSubnav";
+import { ModuleSubnav, type ModuleSubnavGroup } from "@govoplan/core-webui";
 
 const campaignSubnav: ModuleSubnavGroup<CampaignWorkspaceSection>[] = [
 {