diff --git a/.gitignore b/test/end-to-end-tests/.gitignore
similarity index 100%
rename from .gitignore
rename to test/end-to-end-tests/.gitignore
diff --git a/README.md b/test/end-to-end-tests/README.md
similarity index 100%
rename from README.md
rename to test/end-to-end-tests/README.md
diff --git a/TODO.md b/test/end-to-end-tests/TODO.md
similarity index 100%
rename from TODO.md
rename to test/end-to-end-tests/TODO.md
diff --git a/install.sh b/test/end-to-end-tests/install.sh
similarity index 100%
rename from install.sh
rename to test/end-to-end-tests/install.sh
diff --git a/package.json b/test/end-to-end-tests/package.json
similarity index 100%
rename from package.json
rename to test/end-to-end-tests/package.json
diff --git a/riot/.gitignore b/test/end-to-end-tests/riot/.gitignore
similarity index 100%
rename from riot/.gitignore
rename to test/end-to-end-tests/riot/.gitignore
diff --git a/riot/config-template/config.json b/test/end-to-end-tests/riot/config-template/config.json
similarity index 100%
rename from riot/config-template/config.json
rename to test/end-to-end-tests/riot/config-template/config.json
diff --git a/riot/install.sh b/test/end-to-end-tests/riot/install.sh
similarity index 100%
rename from riot/install.sh
rename to test/end-to-end-tests/riot/install.sh
diff --git a/riot/start.sh b/test/end-to-end-tests/riot/start.sh
similarity index 100%
rename from riot/start.sh
rename to test/end-to-end-tests/riot/start.sh
diff --git a/riot/stop.sh b/test/end-to-end-tests/riot/stop.sh
similarity index 100%
rename from riot/stop.sh
rename to test/end-to-end-tests/riot/stop.sh
diff --git a/run.sh b/test/end-to-end-tests/run.sh
similarity index 100%
rename from run.sh
rename to test/end-to-end-tests/run.sh
diff --git a/src/logbuffer.js b/test/end-to-end-tests/src/logbuffer.js
similarity index 100%
rename from src/logbuffer.js
rename to test/end-to-end-tests/src/logbuffer.js
diff --git a/src/logger.js b/test/end-to-end-tests/src/logger.js
similarity index 100%
rename from src/logger.js
rename to test/end-to-end-tests/src/logger.js
diff --git a/src/rest/consent.js b/test/end-to-end-tests/src/rest/consent.js
similarity index 100%
rename from src/rest/consent.js
rename to test/end-to-end-tests/src/rest/consent.js
diff --git a/src/rest/creator.js b/test/end-to-end-tests/src/rest/creator.js
similarity index 100%
rename from src/rest/creator.js
rename to test/end-to-end-tests/src/rest/creator.js
diff --git a/src/rest/multi.js b/test/end-to-end-tests/src/rest/multi.js
similarity index 100%
rename from src/rest/multi.js
rename to test/end-to-end-tests/src/rest/multi.js
diff --git a/src/rest/room.js b/test/end-to-end-tests/src/rest/room.js
similarity index 100%
rename from src/rest/room.js
rename to test/end-to-end-tests/src/rest/room.js
diff --git a/src/rest/session.js b/test/end-to-end-tests/src/rest/session.js
similarity index 100%
rename from src/rest/session.js
rename to test/end-to-end-tests/src/rest/session.js
diff --git a/src/scenario.js b/test/end-to-end-tests/src/scenario.js
similarity index 100%
rename from src/scenario.js
rename to test/end-to-end-tests/src/scenario.js
diff --git a/src/scenarios/README.md b/test/end-to-end-tests/src/scenarios/README.md
similarity index 100%
rename from src/scenarios/README.md
rename to test/end-to-end-tests/src/scenarios/README.md
diff --git a/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
similarity index 100%
rename from src/scenarios/directory.js
rename to test/end-to-end-tests/src/scenarios/directory.js
diff --git a/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
similarity index 100%
rename from src/scenarios/e2e-encryption.js
rename to test/end-to-end-tests/src/scenarios/e2e-encryption.js
diff --git a/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
similarity index 100%
rename from src/scenarios/lazy-loading.js
rename to test/end-to-end-tests/src/scenarios/lazy-loading.js
diff --git a/src/session.js b/test/end-to-end-tests/src/session.js
similarity index 100%
rename from src/session.js
rename to test/end-to-end-tests/src/session.js
diff --git a/src/usecases/README.md b/test/end-to-end-tests/src/usecases/README.md
similarity index 100%
rename from src/usecases/README.md
rename to test/end-to-end-tests/src/usecases/README.md
diff --git a/src/usecases/accept-invite.js b/test/end-to-end-tests/src/usecases/accept-invite.js
similarity index 100%
rename from src/usecases/accept-invite.js
rename to test/end-to-end-tests/src/usecases/accept-invite.js
diff --git a/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
similarity index 100%
rename from src/usecases/create-room.js
rename to test/end-to-end-tests/src/usecases/create-room.js
diff --git a/src/usecases/dialog.js b/test/end-to-end-tests/src/usecases/dialog.js
similarity index 100%
rename from src/usecases/dialog.js
rename to test/end-to-end-tests/src/usecases/dialog.js
diff --git a/src/usecases/invite.js b/test/end-to-end-tests/src/usecases/invite.js
similarity index 100%
rename from src/usecases/invite.js
rename to test/end-to-end-tests/src/usecases/invite.js
diff --git a/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
similarity index 100%
rename from src/usecases/join.js
rename to test/end-to-end-tests/src/usecases/join.js
diff --git a/src/usecases/memberlist.js b/test/end-to-end-tests/src/usecases/memberlist.js
similarity index 100%
rename from src/usecases/memberlist.js
rename to test/end-to-end-tests/src/usecases/memberlist.js
diff --git a/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
similarity index 100%
rename from src/usecases/room-settings.js
rename to test/end-to-end-tests/src/usecases/room-settings.js
diff --git a/src/usecases/send-message.js b/test/end-to-end-tests/src/usecases/send-message.js
similarity index 100%
rename from src/usecases/send-message.js
rename to test/end-to-end-tests/src/usecases/send-message.js
diff --git a/src/usecases/settings.js b/test/end-to-end-tests/src/usecases/settings.js
similarity index 100%
rename from src/usecases/settings.js
rename to test/end-to-end-tests/src/usecases/settings.js
diff --git a/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
similarity index 100%
rename from src/usecases/signup.js
rename to test/end-to-end-tests/src/usecases/signup.js
diff --git a/src/usecases/timeline.js b/test/end-to-end-tests/src/usecases/timeline.js
similarity index 100%
rename from src/usecases/timeline.js
rename to test/end-to-end-tests/src/usecases/timeline.js
diff --git a/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
similarity index 100%
rename from src/usecases/verify.js
rename to test/end-to-end-tests/src/usecases/verify.js
diff --git a/src/util.js b/test/end-to-end-tests/src/util.js
similarity index 100%
rename from src/util.js
rename to test/end-to-end-tests/src/util.js
diff --git a/start.js b/test/end-to-end-tests/start.js
similarity index 100%
rename from start.js
rename to test/end-to-end-tests/start.js
diff --git a/synapse/.gitignore b/test/end-to-end-tests/synapse/.gitignore
similarity index 100%
rename from synapse/.gitignore
rename to test/end-to-end-tests/synapse/.gitignore
diff --git a/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
similarity index 100%
rename from synapse/config-templates/consent/homeserver.yaml
rename to test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
diff --git a/synapse/config-templates/consent/res/templates/privacy/en/1.0.html b/test/end-to-end-tests/synapse/config-templates/consent/res/templates/privacy/en/1.0.html
similarity index 100%
rename from synapse/config-templates/consent/res/templates/privacy/en/1.0.html
rename to test/end-to-end-tests/synapse/config-templates/consent/res/templates/privacy/en/1.0.html
diff --git a/synapse/config-templates/consent/res/templates/privacy/en/success.html b/test/end-to-end-tests/synapse/config-templates/consent/res/templates/privacy/en/success.html
similarity index 100%
rename from synapse/config-templates/consent/res/templates/privacy/en/success.html
rename to test/end-to-end-tests/synapse/config-templates/consent/res/templates/privacy/en/success.html
diff --git a/synapse/install.sh b/test/end-to-end-tests/synapse/install.sh
similarity index 100%
rename from synapse/install.sh
rename to test/end-to-end-tests/synapse/install.sh
diff --git a/synapse/start.sh b/test/end-to-end-tests/synapse/start.sh
similarity index 100%
rename from synapse/start.sh
rename to test/end-to-end-tests/synapse/start.sh
diff --git a/synapse/stop.sh b/test/end-to-end-tests/synapse/stop.sh
similarity index 100%
rename from synapse/stop.sh
rename to test/end-to-end-tests/synapse/stop.sh
diff --git a/yarn.lock b/test/end-to-end-tests/yarn.lock
similarity index 100%
rename from yarn.lock
rename to test/end-to-end-tests/yarn.lock