diff --git a/Dockerfile b/Dockerfile
index b41b5c4..2de570c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy the client code into the container
-COPY client.py .
+COPY .app .
 
 # Define environment variable for the server host
 # This will be set by the Makefile when running the container
diff --git a/client.py b/app/client.py
similarity index 100%
rename from client.py
rename to app/client.py
diff --git a/drb_cdb_api.py b/app/drb_cdb_api.py
similarity index 100%
rename from drb_cdb_api.py
rename to app/drb_cdb_api.py
diff --git a/server_api.py b/app/server_api.py
similarity index 100%
rename from server_api.py
rename to app/server_api.py