diff --git a/api/server/src/test/dataset/generate_graph.sh b/api/server/src/test/dataset/generate_graph.sh
index 55e85e3..bb5fdb4 100755
--- a/api/server/src/test/dataset/generate_graph.sh
+++ b/api/server/src/test/dataset/generate_graph.sh
@@ -1,20 +1,21 @@
 #!/bin/bash
 
 # Build Docker work environment
 toplevel_dir=`git rev-parse --show-toplevel`
 mkdir -p dockerfiles
-cp $toplevel_dir/compression/{compress_graph.sh,Dockerfile} dockerfiles/
+cp -r $toplevel_dir/dockerfiles/ .
 docker build --tag swh-graph-test dockerfiles
 
 # Setup input for compression script
 tr ' ' '\n' < graph.edges.csv | sort -u > graph.nodes.csv
 gzip --force --keep graph.edges.csv
 gzip --force --keep graph.nodes.csv
 
 # Setup output
 rm -f stderr stdout
 
-docker run                                          \
-    --name swh-graph-test --rm --tty --interactive  \
-    --volume $(pwd):/data swh-graph-test:latest     \
-    ./compress_graph.sh --input /data/graph --output /data/ --lib /graph-lib/
+docker run                                                  \
+    --name swh-graph-test --rm --tty --interactive          \
+    --volume $(pwd):/data swh-graph-test:latest             \
+    ./scripts/compress_graph.sh                             \
+    --input /data/graph --output /data/ --lib /graph-lib/
diff --git a/compression/Dockerfile b/dockerfiles/Dockerfile
similarity index 94%
rename from compression/Dockerfile
rename to dockerfiles/Dockerfile
index d0dc4ca..ca74bb8 100644
--- a/compression/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -1,18 +1,18 @@
 FROM maven:3.6.0-jdk-11
 WORKDIR /graph-lib
 
 # Download webgraph binary
 RUN curl -O http://webgraph.di.unimi.it/webgraph-big-3.5.0-bin.tar.gz
 RUN tar xvfz webgraph-big-3.5.0-bin.tar.gz
 RUN cp webgraph-big-3.5.0/webgraph-big-3.5.0.jar .
 
 # Download webgraph dependencies
 RUN curl -O http://webgraph.di.unimi.it/webgraph-big-deps.tar.gz
 RUN tar xvfz webgraph-big-deps.tar.gz
 
 # Monitoring
 RUN apt-get update
 RUN apt-get install -y time
 
 WORKDIR /graph
-COPY compress_graph.sh .
+COPY scripts scripts/
diff --git a/compression/compress_graph.sh b/dockerfiles/scripts/compress_graph.sh
similarity index 100%
rename from compression/compress_graph.sh
rename to dockerfiles/scripts/compress_graph.sh