diff --git a/compose/docker-compose-external-test.yml b/stack-orchestrator/compose/docker-compose-external-test.yml
similarity index 100%
rename from compose/docker-compose-external-test.yml
rename to stack-orchestrator/compose/docker-compose-external-test.yml
diff --git a/stack-orchestrator/config/external-test/external-test.env b/stack-orchestrator/config/external-test/external-test.env
new file mode 100644
index 0000000..c029280
--- /dev/null
+++ b/stack-orchestrator/config/external-test/external-test.env
@@ -0,0 +1,2 @@
+EXTERNAL-TEST-VARIABLE1=variable1-value
+
diff --git a/container-build/cerc-external-test-container/Dockerfile b/stack-orchestrator/container-build/cerc-external-test-container/Dockerfile
similarity index 100%
rename from container-build/cerc-external-test-container/Dockerfile
rename to stack-orchestrator/container-build/cerc-external-test-container/Dockerfile
diff --git a/container-build/cerc-external-test-container/build.sh b/stack-orchestrator/container-build/cerc-external-test-container/build.sh
similarity index 100%
rename from container-build/cerc-external-test-container/build.sh
rename to stack-orchestrator/container-build/cerc-external-test-container/build.sh
diff --git a/container-build/cerc-external-test-container/run.sh b/stack-orchestrator/container-build/cerc-external-test-container/run.sh
similarity index 100%
rename from container-build/cerc-external-test-container/run.sh
rename to stack-orchestrator/container-build/cerc-external-test-container/run.sh
diff --git a/stacks/test-external-stack/README.md b/stack-orchestrator/stacks/test-external-stack/README.md
similarity index 100%
rename from stacks/test-external-stack/README.md
rename to stack-orchestrator/stacks/test-external-stack/README.md
diff --git a/stacks/test-external-stack/deploy/commands.py b/stack-orchestrator/stacks/test-external-stack/deploy/commands.py
similarity index 100%
rename from stacks/test-external-stack/deploy/commands.py
rename to stack-orchestrator/stacks/test-external-stack/deploy/commands.py
diff --git a/stacks/test-external-stack/stack.yml b/stack-orchestrator/stacks/test-external-stack/stack.yml
similarity index 100%
rename from stacks/test-external-stack/stack.yml
rename to stack-orchestrator/stacks/test-external-stack/stack.yml