diff --git a/api.planx.uk/modules/analytics/index.test.ts b/api.planx.uk/modules/analytics/analyticsLog/analyticsLog.test.ts
similarity index 95%
rename from api.planx.uk/modules/analytics/index.test.ts
rename to api.planx.uk/modules/analytics/analyticsLog/analyticsLog.test.ts
index 4112fc0dae..055a1a5847 100644
--- a/api.planx.uk/modules/analytics/index.test.ts
+++ b/api.planx.uk/modules/analytics/analyticsLog/analyticsLog.test.ts
@@ -1,6 +1,6 @@
 import supertest from "supertest";
-import app from "../../server.js";
-import { queryMock } from "../../tests/graphqlQueryMock.js";
+import app from "../../../server.js";
+import { queryMock } from "../../../tests/graphqlQueryMock.js";
 
 describe("Logging analytics", () => {
   beforeEach(() => {
diff --git a/api.planx.uk/modules/analytics/controller.ts b/api.planx.uk/modules/analytics/analyticsLog/controller.ts
similarity index 89%
rename from api.planx.uk/modules/analytics/controller.ts
rename to api.planx.uk/modules/analytics/analyticsLog/controller.ts
index 5c46bfbc8b..5fecfeda7e 100644
--- a/api.planx.uk/modules/analytics/controller.ts
+++ b/api.planx.uk/modules/analytics/analyticsLog/controller.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { trackAnalyticsLogExit } from "./service.js";
-import type { ValidatedRequestHandler } from "../../shared/middleware/validate.js";
+import type { ValidatedRequestHandler } from "../../../shared/middleware/validate.js";
 
 export const logAnalyticsSchema = z.object({
   query: z.object({
diff --git a/api.planx.uk/modules/analytics/service.ts b/api.planx.uk/modules/analytics/analyticsLog/service.ts
similarity index 96%
rename from api.planx.uk/modules/analytics/service.ts
rename to api.planx.uk/modules/analytics/analyticsLog/service.ts
index 413d0d971b..6d2de0ef03 100644
--- a/api.planx.uk/modules/analytics/service.ts
+++ b/api.planx.uk/modules/analytics/analyticsLog/service.ts
@@ -1,5 +1,5 @@
 import { gql } from "graphql-request";
-import { $public } from "../../client/index.js";
+import { $public } from "../../../client/index.js";
 
 interface UpdateAnalyticsLogUserExit {
   analyticsLog: {
diff --git a/api.planx.uk/modules/analytics/metabase/collection/collection.test.ts b/api.planx.uk/modules/analytics/metabase/collection/collection.test.ts
new file mode 100644
index 0000000000..1b66e90a88
--- /dev/null
+++ b/api.planx.uk/modules/analytics/metabase/collection/collection.test.ts
@@ -0,0 +1 @@
+test.todo("should test collection check and creation");
diff --git a/api.planx.uk/modules/analytics/metabase/collection/controller.ts b/api.planx.uk/modules/analytics/metabase/collection/controller.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/collection/service.ts b/api.planx.uk/modules/analytics/metabase/collection/service.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/collection/types.ts b/api.planx.uk/modules/analytics/metabase/collection/types.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/dashboard/controller.ts b/api.planx.uk/modules/analytics/metabase/dashboard/controller.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/dashboard/dashboard.test.ts b/api.planx.uk/modules/analytics/metabase/dashboard/dashboard.test.ts
new file mode 100644
index 0000000000..799df9fcd4
--- /dev/null
+++ b/api.planx.uk/modules/analytics/metabase/dashboard/dashboard.test.ts
@@ -0,0 +1 @@
+test.todo("should test dashboard creation, filtering and link generation");
diff --git a/api.planx.uk/modules/analytics/metabase/dashboard/service.ts b/api.planx.uk/modules/analytics/metabase/dashboard/service.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/dashboard/types.ts b/api.planx.uk/modules/analytics/metabase/dashboard/types.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/index.ts b/api.planx.uk/modules/analytics/metabase/index.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/shared/client.test.ts b/api.planx.uk/modules/analytics/metabase/shared/client.test.ts
new file mode 100644
index 0000000000..43d9c7a3f9
--- /dev/null
+++ b/api.planx.uk/modules/analytics/metabase/shared/client.test.ts
@@ -0,0 +1 @@
+test.todo("should test configuration and errors");
diff --git a/api.planx.uk/modules/analytics/metabase/shared/client.ts b/api.planx.uk/modules/analytics/metabase/shared/client.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/metabase/shared/types.ts b/api.planx.uk/modules/analytics/metabase/shared/types.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api.planx.uk/modules/analytics/routes.ts b/api.planx.uk/modules/analytics/routes.ts
index 22945515be..9dcaa69010 100644
--- a/api.planx.uk/modules/analytics/routes.ts
+++ b/api.planx.uk/modules/analytics/routes.ts
@@ -4,7 +4,7 @@ import {
   logAnalyticsSchema,
   logUserExitController,
   logUserResumeController,
-} from "./controller.js";
+} from "./analyticsLog/controller.js";
 
 const router = Router();