diff --git a/app/(marketing)/_components/site-footer.tsx b/app/(marketing)/_components/site-footer.tsx
index 88ad9d8..8650fd9 100644
--- a/app/(marketing)/_components/site-footer.tsx
+++ b/app/(marketing)/_components/site-footer.tsx
@@ -1,8 +1,8 @@
-import { Footer } from '@kit/ui/marketing';
-import { Trans } from '@kit/ui/trans';
+import { appConfig } from '@/packages/shared/src/config';
 
 import { AppLogo } from '@kit/shared/components/app-logo';
-import appConfig from '@kit/shared/config/app.config';
+import { Footer } from '@kit/ui/marketing';
+import { Trans } from '@kit/ui/trans';
 
 export function SiteFooter() {
   return (
diff --git a/app/home/[account]/_components/team-account-benefit-statistics.tsx b/app/home/[account]/_components/team-account-benefit-statistics.tsx
index 63c964a..a116dde 100644
--- a/app/home/[account]/_components/team-account-benefit-statistics.tsx
+++ b/app/home/[account]/_components/team-account-benefit-statistics.tsx
@@ -7,15 +7,12 @@ import { Database } from '@/packages/supabase/src/database.types';
 import { PiggyBankIcon, Settings } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 
+import { createPath, pathsConfig } from '@kit/shared/config';
 import { Card, CardTitle } from '@kit/ui/card';
 import { cn } from '@kit/ui/lib/utils';
 import { Button } from '@kit/ui/shadcn/button';
 import { Trans } from '@kit/ui/trans';
 
-import { pathsConfig } from '@kit/shared/config';
-
-import { createPath } from '@kit/shared/config/team-account-navigation.config';
-
 interface TeamAccountBenefitStatisticsProps {
   employeeCount: number;
   accountSlug: string;
diff --git a/app/home/[account]/_components/team-account-layout-sidebar.tsx b/app/home/[account]/_components/team-account-layout-sidebar.tsx
index 9c5b50b..0406984 100644
--- a/app/home/[account]/_components/team-account-layout-sidebar.tsx
+++ b/app/home/[account]/_components/team-account-layout-sidebar.tsx
@@ -1,6 +1,9 @@
 import type { User } from '@supabase/supabase-js';
 
+import { getTeamAccountSidebarConfig } from '@/packages/shared/src/config';
+
 import { ApplicationRole } from '@kit/accounts/types/accounts';
+import { ProfileAccountDropdownContainer } from '@kit/shared/components//personal-account-dropdown-container';
 import {
   Sidebar,
   SidebarContent,
@@ -8,8 +11,6 @@ import {
   SidebarHeader,
 } from '@kit/ui/shadcn-sidebar';
 
-import { ProfileAccountDropdownContainer } from '@kit/shared/components//personal-account-dropdown-container';
-import { getTeamAccountSidebarConfig } from '@kit/shared/config/team-account-navigation.config';
 import { TeamAccountNotifications } from '~/home/[account]/_components/team-account-notifications';
 
 import { TeamAccountAccountsSelector } from '../_components/team-account-accounts-selector';
diff --git a/app/home/[account]/_components/team-account-navigation-menu.tsx b/app/home/[account]/_components/team-account-navigation-menu.tsx
index f273d53..b224ca9 100644
--- a/app/home/[account]/_components/team-account-navigation-menu.tsx
+++ b/app/home/[account]/_components/team-account-navigation-menu.tsx
@@ -1,8 +1,9 @@
 import { useMemo } from 'react';
 
+import { getTeamAccountSidebarConfig } from '@/packages/shared/src/config';
+
 import { AppLogo } from '@kit/shared/components/app-logo';
 import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
-import { getTeamAccountSidebarConfig } from '@kit/shared/config/team-account-navigation.config';
 
 // local imports
 import { TeamAccountWorkspace } from '../_lib/server/team-account-workspace.loader';
diff --git a/app/home/[account]/_components/team-account-statistics.tsx b/app/home/[account]/_components/team-account-statistics.tsx
index e0811ce..ac371e6 100644
--- a/app/home/[account]/_components/team-account-statistics.tsx
+++ b/app/home/[account]/_components/team-account-statistics.tsx
@@ -10,6 +10,7 @@ import { enGB, et } from 'date-fns/locale';
 import { CalendarIcon, ChevronRight, Euro, User } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 
+import { createPath, pathsConfig } from '@kit/shared/config';
 import { Card } from '@kit/ui/card';
 import { Trans } from '@kit/ui/makerkit/trans';
 import { Button } from '@kit/ui/shadcn/button';
@@ -20,10 +21,6 @@ import {
   PopoverTrigger,
 } from '@kit/ui/shadcn/popover';
 
-import { pathsConfig } from '@kit/shared/config';
-
-import { createPath } from '@kit/shared/config/team-account-navigation.config';
-
 import TeamAccountBenefitStatistics from './team-account-benefit-statistics';
 import TeamAccountHealthDetails from './team-account-health-details';
 
diff --git a/app/select-package/page.tsx b/app/select-package/page.tsx
index 41a73ac..8b900b2 100644
--- a/app/select-package/page.tsx
+++ b/app/select-package/page.tsx
@@ -1,16 +1,15 @@
 import Link from 'next/link';
 
-import SelectAnalysisPackages from '@kit/shared/components/select-analysis-packages';
 import { CaretRightIcon } from '@radix-ui/react-icons';
 import { Scale } from 'lucide-react';
 
+import SelectAnalysisPackages from '@kit/shared/components/select-analysis-packages';
 import { Button } from '@kit/ui/button';
 import { Trans } from '@kit/ui/trans';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-
 import { MedReportLogo } from '../../components/med-report-logo';
 import pathsConfig from '../../config/paths.config';
 import ComparePackagesModal from '../home/(user)/_components/compare-packages-modal';
diff --git a/packages/shared/src/components/root-providers.tsx b/packages/shared/src/components/root-providers.tsx
index 9b72a16..7b784ec 100644
--- a/packages/shared/src/components/root-providers.tsx
+++ b/packages/shared/src/components/root-providers.tsx
@@ -18,7 +18,6 @@ import { VersionUpdater } from '@kit/ui/version-updater';
 
 import { i18nResolver } from '../../../../lib/i18n/i18n.resolver';
 import { getI18nSettings } from '../../../../lib/i18n/i18n.settings';
-
 import { ReactQueryProvider } from './react-query-provider';
 
 const captchaSiteKey = authConfig.captchaTokenSiteKey;