diff --git a/.gitignore b/.gitignore
index 101f232e..51d177fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,4 +170,3 @@ cython_debug/
 #.idea/
 
 data/
-eval/
diff --git a/Dockerfile.client b/docker/client/Dockerfile.client
similarity index 52%
rename from Dockerfile.client
rename to docker/client/Dockerfile.client
index a3f0f774..0e8dfb9d 100644
--- a/Dockerfile.client
+++ b/docker/client/Dockerfile.client
@@ -15,14 +15,14 @@ WORKDIR /app
 COPY . .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
-RUN unzip WIDER_train.zip -d data/ && mv data/WIDER_train/images data/WIDER_FACE  && rm -rf data/WIDER_train && rm WIDER_train.zip
-RUN tar xvf annotations.tar.gz -C data/WIDER_FACE/  && rm annotations.tar.gz
-RUN unzip afw_images.zip -d data/ && mv data/afw_images data/AFW && rm -rf data/afw_images && rm afw_images.zip
-RUN unzip pascal_images.zip -d data/ && mv data/pascal_images data/PASCAL && rm -rf data/pascal_images && rm pascal_images.zip
-RUN unzip fddb_images.zip -d data/ && mv data/fddb_images data/FDDB && rm -rf data/fddb_images && rm fddb_images.zip
+RUN unzip data/WIDER_FACE/WIDER_train.zip -d data/ && mv data/WIDER_train/images data/WIDER_FACE  && rm -rf data/WIDER_train && rm data/WIDER_FACE/WIDER_train.zip
+RUN tar xvf data/WIDER_FACE/annotations.tar.gz -C data/WIDER_FACE/  && rm data/WIDER_FACE/annotations.tar.gz
+RUN unzip data/AFW/afw_images.zip -d data/ && mv data/afw_images data/AFW && rm -rf data/afw_images && rm data/AFW/afw_images.zip
+RUN unzip data/PASCAL/pascal_images.zip -d data/ && mv data/pascal_images data/PASCAL && rm -rf data/pascal_images && rm data/PASCAL/pascal_images.zip
+RUN unzip data/FDDB/fddb_images.zip -d data/ && mv data/fddb_images data/FDDB && rm -rf data/fddb_images && rm data/FDDB/fddb_images.zip
 
 
-COPY start_flower_client.sh /usr/local/bin/start_flower_client.sh
+COPY docker/client/start_flower_client.sh /usr/local/bin/start_flower_client.sh
 RUN chmod +x /usr/local/bin/start_flower_client.sh
 
 ENV PARTITION_ID=0
diff --git a/Dockerfile.client.dockerignore b/docker/client/Dockerfile.client.dockerignore
similarity index 93%
rename from Dockerfile.client.dockerignore
rename to docker/client/Dockerfile.client.dockerignore
index d1a8d625..e7b67533 100644
--- a/Dockerfile.client.dockerignore
+++ b/docker/client/Dockerfile.client.dockerignore
@@ -92,9 +92,3 @@ venv/
 */*.swp
 */*/*.swp
 */*/*/*.swp
-
-eval/
-weights
-data/*/images
-data/*/annotations
-start_flower_server.sh
\ No newline at end of file
diff --git a/start_flower_client.sh b/docker/client/start_flower_client.sh
similarity index 100%
rename from start_flower_client.sh
rename to docker/client/start_flower_client.sh
diff --git a/Dockerfile.server b/docker/server/Dockerfile.server
similarity index 88%
rename from Dockerfile.server
rename to docker/server/Dockerfile.server
index fe7fa7ab..fbcccf7d 100644
--- a/Dockerfile.server
+++ b/docker/server/Dockerfile.server
@@ -13,7 +13,7 @@ WORKDIR /app
 COPY . .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
 
-COPY start_flower_server.sh /usr/local/bin/start_flower_server.sh
+COPY docker/server/start_flower_server.sh /usr/local/bin/start_flower_server.sh
 RUN chmod +x /usr/local/bin/start_flower_server.sh
 
 ENV NUM_ROUNDS=2
diff --git a/Dockerfile.server.dockerignore b/docker/server/Dockerfile.server.dockerignore
similarity index 92%
rename from Dockerfile.server.dockerignore
rename to docker/server/Dockerfile.server.dockerignore
index abc465ef..124882e3 100644
--- a/Dockerfile.server.dockerignore
+++ b/docker/server/Dockerfile.server.dockerignore
@@ -93,11 +93,3 @@ venv/
 */*/*.swp
 */*/*/*.swp
 
-eval/
-weights
-data/*/images
-data/*/annotations
-
-*.zip
-*.tar.gz
-start_flower_client.sh
\ No newline at end of file
diff --git a/start_flower_server.sh b/docker/server/start_flower_server.sh
similarity index 100%
rename from start_flower_server.sh
rename to docker/server/start_flower_server.sh