diff --git a/next.config.js b/next.config.js
index 9be316cf..7554e226 100644
--- a/next.config.js
+++ b/next.config.js
@@ -167,6 +167,10 @@ const config = {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
       },
+      {
+        source: '/teams/:teamId/:path*',
+        destination: '/:path*',
+      },
     ];
   },
   async redirects() {
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fdf5c5f5..0777cc1f 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,6 +6,7 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
+import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -44,6 +45,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
+    {
+      title: formatMessage(labels.journey),
+      description: formatMessage(labels.journeyDescription),
+      url: renderTeamUrl('/reports/journey'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/teams/[teamId]/dashboard/page.tsx b/src/app/(main)/teams/[teamId]/dashboard/page.tsx
deleted file mode 100644
index bf8f2fed..00000000
--- a/src/app/(main)/teams/[teamId]/dashboard/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/dashboard/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx b/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx
deleted file mode 100644
index 0f51aa88..00000000
--- a/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/[reportId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/create/page.tsx b/src/app/(main)/teams/[teamId]/reports/create/page.tsx
deleted file mode 100644
index c1e77757..00000000
--- a/src/app/(main)/teams/[teamId]/reports/create/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/create/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx b/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx
deleted file mode 100644
index 77a6c44d..00000000
--- a/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/event-data/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx b/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx
deleted file mode 100644
index be91966c..00000000
--- a/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/funnel/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/insights/page.tsx b/src/app/(main)/teams/[teamId]/reports/insights/page.tsx
deleted file mode 100644
index f8a91c65..00000000
--- a/src/app/(main)/teams/[teamId]/reports/insights/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/insights/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/page.tsx b/src/app/(main)/teams/[teamId]/reports/page.tsx
deleted file mode 100644
index 5404e128..00000000
--- a/src/app/(main)/teams/[teamId]/reports/page.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import Page from 'app/(main)/reports/page';
-import { Metadata } from 'next';
-
-export default Page;
-
-export const metadata: Metadata = {
-  title: 'Team Reports',
-};
diff --git a/src/app/(main)/teams/[teamId]/reports/retention/page.tsx b/src/app/(main)/teams/[teamId]/reports/retention/page.tsx
deleted file mode 100644
index 62f8e5bf..00000000
--- a/src/app/(main)/teams/[teamId]/reports/retention/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/retention/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/utm/page.tsx b/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
deleted file mode 100644
index 6070e7c5..00000000
--- a/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/utm/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
deleted file mode 100644
index 5f894228..00000000
--- a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-'use client';
-import { ReactNode } from 'react';
-import MenuLayout from 'components/layout/MenuLayout';
-import { useMessages } from 'components/hooks';
-
-export default function ({ children, teamId }: { children: ReactNode; teamId: string }) {
-  const { formatMessage, labels } = useMessages();
-
-  const items = [
-    {
-      key: 'team',
-      label: formatMessage(labels.team),
-      url: `/teams/${teamId}/settings/team`,
-    },
-    {
-      key: 'websites',
-      label: formatMessage(labels.websites),
-      url: `/teams/${teamId}/settings/websites`,
-    },
-    {
-      key: 'members',
-      label: formatMessage(labels.members),
-      url: `/teams/${teamId}/settings/members`,
-    },
-  ].filter(n => n);
-
-  return <MenuLayout items={items}>{children}</MenuLayout>;
-}
diff --git a/src/app/(main)/teams/[teamId]/settings/layout.tsx b/src/app/(main)/teams/[teamId]/settings/layout.tsx
deleted file mode 100644
index b32d39e8..00000000
--- a/src/app/(main)/teams/[teamId]/settings/layout.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import TeamSettingsLayout from './TeamSettingsLayout';
-import { Metadata } from 'next';
-
-export default function ({ children, params: { teamId } }) {
-  return <TeamSettingsLayout teamId={teamId}>{children}</TeamSettingsLayout>;
-}
-
-export const metadata: Metadata = {
-  title: 'Team Settings',
-};
diff --git a/src/app/(main)/teams/[teamId]/settings/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
deleted file mode 100644
index a4045ab4..00000000
--- a/src/app/(main)/teams/[teamId]/settings/members/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/members/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
deleted file mode 100644
index c36e667c..00000000
--- a/src/app/(main)/teams/[teamId]/settings/team/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/team/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
deleted file mode 100644
index ad1a97dd..00000000
--- a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/websites/[websiteId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
deleted file mode 100644
index 897c60fe..00000000
--- a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/websites/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
deleted file mode 100644
index 65b9537e..00000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/compare/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
deleted file mode 100644
index 87de2abe..00000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/event-data/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx
deleted file mode 100644
index 224ff4d5..00000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
deleted file mode 100644
index ffeaa928..00000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/realtime/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
deleted file mode 100644
index 9a97b9c5..00000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/reports/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/page.tsx b/src/app/(main)/teams/[teamId]/websites/page.tsx
deleted file mode 100644
index 553c852a..00000000
--- a/src/app/(main)/teams/[teamId]/websites/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/page';
-
-export default Page;