diff --git a/Dockerfile b/Dockerfile
index 3ff765b..bf42151 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,13 @@
 FROM sourcepole/qwc-uwsgi-base:alpine-v2023.10.26
 
-ADD . /srv/qwc_service
+ADD requirements/requirements.txt /srv/qwc_service/requirements.txt
 
 RUN \
     apk add --no-cache --update --virtual runtime-deps postgresql-libs && \
     apk add --no-cache --update --virtual build-deps git postgresql-dev g++ python3-dev && \
-    pip3 install --no-cache-dir -r /srv/qwc_service/requirements/requirements.txt && \
+    pip3 install --no-cache-dir -r /srv/qwc_service/requirements.txt && \
     apk del build-deps
 
+ADD src /srv/qwc_service/
+
 ENV SERVICE_MOUNTPOINT=/api/v1/postgresfts
diff --git a/README.md b/README.md
index 534e2c7..25b5cb1 100644
--- a/README.md
+++ b/README.md
@@ -49,11 +49,11 @@ Configure environment:
 
 Start local service:
 
-    python server.py
+    python src/server.py
 
 Testing
 -------
 
 Run all tests:
 
-    python test.py
+    python src/test.py
diff --git a/search_service.py b/src/search_service.py
similarity index 100%
rename from search_service.py
rename to src/search_service.py
diff --git a/server.py b/src/server.py
similarity index 100%
rename from server.py
rename to src/server.py
diff --git a/server.wsgi b/src/server.wsgi
similarity index 100%
rename from server.wsgi
rename to src/server.wsgi
diff --git a/test.py b/src/test.py
similarity index 100%
rename from test.py
rename to src/test.py