diff --git a/src/__tests__/api/analytics/since-cap.test.ts b/src/__tests__/api/analytics/since-cap.test.ts
index b8511b520..e489e41c5 100644
--- a/src/__tests__/api/analytics/since-cap.test.ts
+++ b/src/__tests__/api/analytics/since-cap.test.ts
@@ -80,7 +80,7 @@ vi.mock("@/lib/rollups/measurement-rollups", () => ({
   ensureUserRollupsFresh: vi.fn().mockResolvedValue(undefined),
 }));
 
-vi.mock("@/lib/measurements/rollup-coverage", () => ({
+vi.mock("@/lib/rollups/measurement-coverage", () => ({
   probeRollupCoverage: vi.fn().mockResolvedValue(new Map()),
 }));
 
@@ -153,7 +153,7 @@ beforeEach(async () => {
     "@/lib/rollups/measurement-rollups"
   );
   const { probeRollupCoverage } = await import(
-    "@/lib/measurements/rollup-coverage"
+    "@/lib/rollups/measurement-coverage"
   );
   const { computeBpInTargetFastPath } = await import(
     "@/lib/analytics/bp-in-target-fast-path"
diff --git a/src/app/api/analytics/route.ts b/src/app/api/analytics/route.ts
index 8a2aa8637..266e7d1f5 100644
--- a/src/app/api/analytics/route.ts
+++ b/src/app/api/analytics/route.ts
@@ -16,7 +16,7 @@ import type {
 import { measurementTypeEnum } from "@/lib/validations/measurement";
 import { pickCanonicalSourceRows } from "@/lib/analytics/source-priority";
 import { ensureUserRollupsFresh } from "@/lib/rollups/measurement-rollups";
-import { probeRollupCoverage } from "@/lib/measurements/rollup-coverage";
+import { probeRollupCoverage } from "@/lib/rollups/measurement-coverage";
 import { computeBpInTargetFastPath } from "@/lib/analytics/bp-in-target-fast-path";
 import { computeUserHealthScoreFastPath } from "@/lib/analytics/health-score-fast-path";
 import { computeCorrelationHypothesesFastPath } from "@/lib/analytics/correlations-fast-path";
diff --git a/src/lib/analytics/__tests__/bp-in-target-fast-path.test.ts b/src/lib/analytics/__tests__/bp-in-target-fast-path.test.ts
index 349ccc8d4..5e781df45 100644
--- a/src/lib/analytics/__tests__/bp-in-target-fast-path.test.ts
+++ b/src/lib/analytics/__tests__/bp-in-target-fast-path.test.ts
@@ -19,7 +19,7 @@ vi.mock("@/lib/logging/context", () => ({
   annotate: vi.fn(),
 }));
 
-vi.mock("@/lib/measurements/rollup-coverage", () => ({
+vi.mock("@/lib/rollups/measurement-coverage", () => ({
   isFullyCovered: vi.fn(),
   probeRollupCoverage: vi.fn(),
 }));
@@ -29,7 +29,7 @@ import { annotate } from "@/lib/logging/context";
 import {
   isFullyCovered,
   probeRollupCoverage,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import { computeBpInTargetFastPath } from "../bp-in-target-fast-path";
 
 const MEASUREMENT_FIND_MANY = prisma.measurement.findMany as unknown as ReturnType<typeof vi.fn>;
diff --git a/src/lib/analytics/__tests__/correlations-fast-path.test.ts b/src/lib/analytics/__tests__/correlations-fast-path.test.ts
index 12087cb10..d8acd1865 100644
--- a/src/lib/analytics/__tests__/correlations-fast-path.test.ts
+++ b/src/lib/analytics/__tests__/correlations-fast-path.test.ts
@@ -22,7 +22,7 @@ vi.mock("@/lib/logging/context", () => ({
   annotate: vi.fn(),
 }));
 
-vi.mock("@/lib/measurements/rollup-coverage", () => ({
+vi.mock("@/lib/rollups/measurement-coverage", () => ({
   isFullyCovered: vi.fn(),
   probeRollupCoverage: vi.fn(),
 }));
@@ -32,7 +32,7 @@ import { annotate } from "@/lib/logging/context";
 import {
   isFullyCovered,
   probeRollupCoverage,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import {
   CORRELATION_WINDOW_DAYS,
   computeCorrelationHypothesesFastPath,
diff --git a/src/lib/analytics/__tests__/health-score-fast-path.test.ts b/src/lib/analytics/__tests__/health-score-fast-path.test.ts
index 5d6883a70..1b74eae26 100644
--- a/src/lib/analytics/__tests__/health-score-fast-path.test.ts
+++ b/src/lib/analytics/__tests__/health-score-fast-path.test.ts
@@ -22,7 +22,7 @@ vi.mock("@/lib/logging/context", () => ({
   annotate: vi.fn(),
 }));
 
-vi.mock("@/lib/measurements/rollup-coverage", () => ({
+vi.mock("@/lib/rollups/measurement-coverage", () => ({
   isFullyCovered: vi.fn(),
   probeRollupCoverage: vi.fn(),
 }));
@@ -32,7 +32,7 @@ import { annotate } from "@/lib/logging/context";
 import {
   isFullyCovered,
   probeRollupCoverage,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import { computeUserHealthScoreFastPath } from "../health-score-fast-path";
 
 const MEASUREMENT_FIND_MANY = prisma.measurement.findMany as unknown as ReturnType<typeof vi.fn>;
diff --git a/src/lib/analytics/bp-in-target-fast-path.ts b/src/lib/analytics/bp-in-target-fast-path.ts
index a85766ed3..2d42884d8 100644
--- a/src/lib/analytics/bp-in-target-fast-path.ts
+++ b/src/lib/analytics/bp-in-target-fast-path.ts
@@ -56,7 +56,7 @@ import { readRollupBuckets } from "@/lib/rollups/measurement-rollups";
 import {
   probeRollupCoverage,
   type RollupCoverageMap,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import { isNearUtc } from "@/lib/tz/resolver";
 import {
   computeBpInTargetWindows,
diff --git a/src/lib/analytics/correlations-fast-path.ts b/src/lib/analytics/correlations-fast-path.ts
index 49c3b2786..0ac4b6a23 100644
--- a/src/lib/analytics/correlations-fast-path.ts
+++ b/src/lib/analytics/correlations-fast-path.ts
@@ -49,7 +49,7 @@ import { readRollupBuckets } from "@/lib/rollups/measurement-rollups";
 import {
   probeRollupCoverage,
   type RollupCoverageMap,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import {
   correlateBpCompliance,
   correlateMoodPulse,
diff --git a/src/lib/analytics/health-score-fast-path.ts b/src/lib/analytics/health-score-fast-path.ts
index c4eca5638..d3ccc848a 100644
--- a/src/lib/analytics/health-score-fast-path.ts
+++ b/src/lib/analytics/health-score-fast-path.ts
@@ -44,7 +44,7 @@ import { readRollupBuckets } from "@/lib/rollups/measurement-rollups";
 import {
   probeRollupCoverage,
   type RollupCoverageMap,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import { readBestGranularityRollups } from "@/lib/measurements/rollup-read-wmy";
 import { calculateCompliance } from "./compliance";
 import {
diff --git a/src/lib/analytics/summaries-slice.ts b/src/lib/analytics/summaries-slice.ts
index 6f6c9ed63..d040d8758 100644
--- a/src/lib/analytics/summaries-slice.ts
+++ b/src/lib/analytics/summaries-slice.ts
@@ -63,7 +63,7 @@ import { ensureUserRollupsFresh } from "@/lib/rollups/measurement-rollups";
 import {
   isFullyCovered,
   probeRollupCoverage,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 import {
   aggregateWmyBuckets,
   readBestGranularityRollups,
diff --git a/src/lib/insights/comprehensive-aggregator.ts b/src/lib/insights/comprehensive-aggregator.ts
index 1d6999cf4..b6b598e39 100644
--- a/src/lib/insights/comprehensive-aggregator.ts
+++ b/src/lib/insights/comprehensive-aggregator.ts
@@ -101,11 +101,11 @@ import { prisma } from "@/lib/db";
 import type { DataSummary } from "@/lib/analytics/trends";
 import { annotate } from "@/lib/logging/context";
 import { ensureUserRollupsFresh } from "@/lib/rollups/measurement-rollups";
-import { aggregateBuckets } from "@/lib/measurements/rollup-read";
+import { aggregateBuckets } from "@/lib/rollups/measurement-read";
 import {
   isFullyCovered,
   probeRollupCoverage,
-} from "@/lib/measurements/rollup-coverage";
+} from "@/lib/rollups/measurement-coverage";
 
 /**
  * Heavy aggregate row — count/min/max/mean alongside the non-composable
diff --git a/src/lib/measurements/__tests__/rollup-read.test.ts b/src/lib/rollups/__tests__/measurement-read.test.ts
similarity index 96%
rename from src/lib/measurements/__tests__/rollup-read.test.ts
rename to src/lib/rollups/__tests__/measurement-read.test.ts
index f0ff3da89..6cbbac500 100644
--- a/src/lib/measurements/__tests__/rollup-read.test.ts
+++ b/src/lib/rollups/__tests__/measurement-read.test.ts
@@ -8,7 +8,7 @@
  */
 import { describe, expect, it } from "vitest";
 
-import { aggregateBuckets, type DailyMeanRow } from "../rollup-read";
+import { aggregateBuckets, type DailyMeanRow } from "../measurement-read";
 
 const dayA: DailyMeanRow = {
   day: new Date("2026-05-08T00:00:00.000Z"),
diff --git a/src/lib/measurements/rollup-coverage.ts b/src/lib/rollups/measurement-coverage.ts
similarity index 100%
rename from src/lib/measurements/rollup-coverage.ts
rename to src/lib/rollups/measurement-coverage.ts
diff --git a/src/lib/measurements/rollup-read.ts b/src/lib/rollups/measurement-read.ts
similarity index 100%
rename from src/lib/measurements/rollup-read.ts
rename to src/lib/rollups/measurement-read.ts
diff --git a/tests/integration/measurement-rollups.test.ts b/tests/integration/measurement-rollups.test.ts
index 4b0c15b11..b911cffe1 100644
--- a/tests/integration/measurement-rollups.test.ts
+++ b/tests/integration/measurement-rollups.test.ts
@@ -33,7 +33,7 @@ import {
   recomputeUserRollups,
   ALL_GRANULARITIES,
 } from "@/lib/rollups/measurement-rollups";
-import { aggregateBuckets } from "@/lib/measurements/rollup-read";
+import { aggregateBuckets } from "@/lib/rollups/measurement-read";
 import { buildComprehensiveAggregate } from "@/lib/insights/comprehensive-aggregator";
 
 vi.mock("@/lib/db-compat", () => ({