diff --git a/src/lib/analytics/health-score-fast-path.ts b/src/lib/analytics/health-score-fast-path.ts
index d3ccc848a..db4a8af09 100644
--- a/src/lib/analytics/health-score-fast-path.ts
+++ b/src/lib/analytics/health-score-fast-path.ts
@@ -45,7 +45,7 @@ import {
   probeRollupCoverage,
   type RollupCoverageMap,
 } from "@/lib/rollups/measurement-coverage";
-import { readBestGranularityRollups } from "@/lib/measurements/rollup-read-wmy";
+import { readBestGranularityRollups } from "@/lib/rollups/measurement-read-wmy";
 import { calculateCompliance } from "./compliance";
 import {
   computeHealthScore,
diff --git a/src/lib/analytics/summaries-slice.ts b/src/lib/analytics/summaries-slice.ts
index d040d8758..8a548c23b 100644
--- a/src/lib/analytics/summaries-slice.ts
+++ b/src/lib/analytics/summaries-slice.ts
@@ -68,7 +68,7 @@ import {
   aggregateWmyBuckets,
   readBestGranularityRollups,
   type RollupBucketRow,
-} from "@/lib/measurements/rollup-read-wmy";
+} from "@/lib/rollups/measurement-read-wmy";
 
 const DAY_MS = 24 * 60 * 60 * 1000;
 
diff --git a/src/lib/measurements/__tests__/rollup-read-cumulative.test.ts b/src/lib/rollups/__tests__/measurement-read-cumulative.test.ts
similarity index 98%
rename from src/lib/measurements/__tests__/rollup-read-cumulative.test.ts
rename to src/lib/rollups/__tests__/measurement-read-cumulative.test.ts
index 293193dfd..9beb554ff 100644
--- a/src/lib/measurements/__tests__/rollup-read-cumulative.test.ts
+++ b/src/lib/rollups/__tests__/measurement-read-cumulative.test.ts
@@ -25,7 +25,7 @@ import {
   isCumulativeType,
   readCumulativeDaySums,
   resolveBucketSum,
-} from "../rollup-read-cumulative";
+} from "../measurement-read-cumulative";
 
 beforeEach(() => {
   mocks.findMany.mockReset();
diff --git a/src/lib/measurements/__tests__/rollup-read-wmy.test.ts b/src/lib/rollups/__tests__/measurement-read-wmy.test.ts
similarity index 99%
rename from src/lib/measurements/__tests__/rollup-read-wmy.test.ts
rename to src/lib/rollups/__tests__/measurement-read-wmy.test.ts
index 2493f0cb7..ade95242d 100644
--- a/src/lib/measurements/__tests__/rollup-read-wmy.test.ts
+++ b/src/lib/rollups/__tests__/measurement-read-wmy.test.ts
@@ -41,7 +41,7 @@ import {
   readWeekRollups,
   readYearRollups,
   type RollupBucketRow,
-} from "../rollup-read-wmy";
+} from "../measurement-read-wmy";
 
 const { findMany } = mocks;
 
diff --git a/src/lib/measurements/rollup-read-cumulative.ts b/src/lib/rollups/measurement-read-cumulative.ts
similarity index 98%
rename from src/lib/measurements/rollup-read-cumulative.ts
rename to src/lib/rollups/measurement-read-cumulative.ts
index ffc61beab..6ad3d53e0 100644
--- a/src/lib/measurements/rollup-read-cumulative.ts
+++ b/src/lib/rollups/measurement-read-cumulative.ts
@@ -30,7 +30,7 @@
  */
 import { prisma } from "@/lib/db";
 import type { MeasurementType } from "@/generated/prisma/client";
-import { CUMULATIVE_HK_TYPES } from "./apple-health-mapping";
+import { CUMULATIVE_HK_TYPES } from "@/lib/measurements/apple-health-mapping";
 
 /**
  * Cumulative measurement types the rollup `sum_value` column serves.
diff --git a/src/lib/measurements/rollup-read-wmy.ts b/src/lib/rollups/measurement-read-wmy.ts
similarity index 100%
rename from src/lib/measurements/rollup-read-wmy.ts
rename to src/lib/rollups/measurement-read-wmy.ts