diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0f95ec9721667e856a3b79a1bdd5444003293066..c98ac1d087968cf901f4b249792714f8dc0e1dea 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -20,5 +20,5 @@ else
       --workers 2 \
       --worker-class uvicorn.workers.UvicornWorker \
       --worker-tmp-dir /dev/shm \
-      geomagio.api:app
+      geomagio.api.app:app
 fi
diff --git a/geomagio/api/app.py b/geomagio/api/app.py
index 07ee0c3497806c3d55f9614eee9e4ca3ae2b940c..a547b128783aff06704cd8fefd551953010fa7f3 100644
--- a/geomagio/api/app.py
+++ b/geomagio/api/app.py
@@ -22,12 +22,12 @@ if LOG_BASIC_CONFIG == "true":
     logging.basicConfig(level=LOG_LEVEL)
 
 
-ws_app = FastAPI()
+app = FastAPI()
 
-ws_app.mount("/ws/secure", secure_app)
-ws_app.mount("/ws", ws_app)
+app.mount("/ws/secure", secure_app)
+app.mount("/ws", ws_app)
 
 
-@ws_app.get("/", include_in_schema=False)
+@app.get("/", include_in_schema=False)
 async def redirect_to_ws():
     return RedirectResponse("/ws")
diff --git a/localdev/docker-compose.yml b/localdev/docker-compose.yml
index 4957687ffceae803e0a5be9834c19e29fef24fb2..ce401e6cee537eb9197678e7db33e1580d1f0d3a 100644
--- a/localdev/docker-compose.yml
+++ b/localdev/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     build:
       context: ../.
       dockerfile: ./Dockerfile
-    command: bash -c "cd /data && python create_db.py && python test_metadata.py && uvicorn --reload geomagio.api:app --host 0.0.0.0 --workers 2"
+    command: bash -c "cd /data && python create_db.py && python test_metadata.py && uvicorn --reload geomagio.api.app:app --host 0.0.0.0 --workers 2"
     ports:
       - '8000:8000'
     extra_hosts:
diff --git a/test_metadata.py b/test_metadata.py
index 477ca2d0e4cefaab445705446a5aa304b5e000b1..4523027039db0523d45f06e932b5ee94defd7498 100644
--- a/test_metadata.py
+++ b/test_metadata.py
@@ -2,12 +2,14 @@ import json
 
 from obspy import UTCDateTime
 
-from geomagio.adjusted import AdjustedMatrix, Metric
+from geomagio.adjusted.AdjustedMatrix import AdjustedMatrix
+from geomagio.adjusted.Metric import Metric
 from geomagio.api.db.models.metadata import Metadata, MetadataCategory
 from geomagio.api.db.factories.MetadataDatabaseFactory import MetadataDatabaseFactory
 from geomagio.api.db.database import engine
 from geomagio.api.ws.Observatory import OBSERVATORIES
-from geomagio.residual import SpreadsheetAbsolutesFactory, WebAbsolutesFactory
+from geomagio.residual.SpreadsheetAbsolutesFactory import SpreadsheetAbsolutesFactory
+from geomagio.residual.WebAbsolutesFactory import WebAbsolutesFactory
 
 
 test_metadata = [