diff --git a/api/fastapi/dataapi/routers/aggregation.py b/api/ooniapi/aggregation.py
similarity index 100%
rename from api/fastapi/dataapi/routers/aggregation.py
rename to api/ooniapi/aggregation.py
diff --git a/api/fastapi/dataapi/routers/measurements.py b/api/ooniapi/measurements.py
similarity index 100%
rename from api/fastapi/dataapi/routers/measurements.py
rename to api/ooniapi/measurements.py