diff --git a/testing/docker-compose.yaml b/testing/docker-compose.yaml
index a8a3b91..9254d47 100644
--- a/testing/docker-compose.yaml
+++ b/testing/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
       - ../substreams:/app/substreams
       - ../proto:/app/proto
       - ./tycho-indexer:/app/testing/tycho-indexer
-      - ./runner.py:/app/testing/runner.py
+      - ./src/runner/runner.py:/app/testing/src.py
     ports:
       - "80:80"
     depends_on:
diff --git a/testing/requirements.txt b/testing/src/requirements.txt
similarity index 100%
rename from testing/requirements.txt
rename to testing/src/requirements.txt
diff --git a/testing/tycho-client/__init__.py b/testing/src/runner/__init__.py
similarity index 100%
rename from testing/tycho-client/__init__.py
rename to testing/src/runner/__init__.py
diff --git a/testing/cli.py b/testing/src/runner/cli.py
similarity index 100%
rename from testing/cli.py
rename to testing/src/runner/cli.py
diff --git a/testing/evm.py b/testing/src/runner/evm.py
similarity index 100%
rename from testing/evm.py
rename to testing/src/runner/evm.py
diff --git a/testing/runner.py b/testing/src/runner/runner.py
similarity index 100%
rename from testing/runner.py
rename to testing/src/runner/runner.py
diff --git a/testing/tycho.py b/testing/src/runner/tycho.py
similarity index 100%
rename from testing/tycho.py
rename to testing/src/runner/tycho.py