diff --git a/environment/README.md b/environment/docker/README.md
similarity index 100%
rename from environment/README.md
rename to environment/docker/README.md
diff --git a/environment/cbs/Dockerfile b/environment/docker/cbs/Dockerfile
similarity index 100%
rename from environment/cbs/Dockerfile
rename to environment/docker/cbs/Dockerfile
diff --git a/environment/cbs/configure-node.sh b/environment/docker/cbs/configure-node.sh
similarity index 100%
rename from environment/cbs/configure-node.sh
rename to environment/docker/cbs/configure-node.sh
diff --git a/environment/docker-compose.yml b/environment/docker/docker-compose.yml
similarity index 96%
rename from environment/docker-compose.yml
rename to environment/docker/docker-compose.yml
index 60e7c03d..affd454b 100644
--- a/environment/docker-compose.yml
+++ b/environment/docker/docker-compose.yml
@@ -32,7 +32,7 @@ services:
 
   cbl-test-logslurp:
     build:
-      context: ./LogSlurp
+      context: ../LogSlurp
       dockerfile: LogSlurp/Dockerfile
     ports:
       - "8180:8180"
diff --git a/environment/docker/sample-config.json b/environment/docker/sample-config.json
new file mode 100644
index 00000000..9de9aa28
--- /dev/null
+++ b/environment/docker/sample-config.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "https://packages.couchbase.com/couchbase-lite/testserver.schema.json",
+  "api-version": 1,
+  "couchbase-servers": [
+    {
+      "hostname": "localhost"
+    }
+  ],
+  "sync-gateways": [
+    {
+      "hostname": "localhost"
+    }
+  ],
+  "logslurp": "true"
+}
\ No newline at end of file
diff --git a/environment/sg/Dockerfile b/environment/docker/sg/Dockerfile
similarity index 100%
rename from environment/sg/Dockerfile
rename to environment/docker/sg/Dockerfile
diff --git a/environment/sg/cert/cert.cer b/environment/docker/sg/cert/cert.cer
similarity index 100%
rename from environment/sg/cert/cert.cer
rename to environment/docker/sg/cert/cert.cer
diff --git a/environment/sg/cert/cert.pem b/environment/docker/sg/cert/cert.pem
similarity index 100%
rename from environment/sg/cert/cert.pem
rename to environment/docker/sg/cert/cert.pem
diff --git a/environment/sg/cert/gen_cert.sh b/environment/docker/sg/cert/gen_cert.sh
similarity index 100%
rename from environment/sg/cert/gen_cert.sh
rename to environment/docker/sg/cert/gen_cert.sh
diff --git a/environment/sg/cert/sg_cert.pem b/environment/docker/sg/cert/sg_cert.pem
similarity index 100%
rename from environment/sg/cert/sg_cert.pem
rename to environment/docker/sg/cert/sg_cert.pem
diff --git a/environment/sg/cert/sg_key.pem b/environment/docker/sg/cert/sg_key.pem
similarity index 100%
rename from environment/sg/cert/sg_key.pem
rename to environment/docker/sg/cert/sg_key.pem
diff --git a/environment/sg/config/bootstrap-nonssl.json b/environment/docker/sg/config/bootstrap-nonssl.json
similarity index 100%
rename from environment/sg/config/bootstrap-nonssl.json
rename to environment/docker/sg/config/bootstrap-nonssl.json
diff --git a/environment/sg/config/bootstrap.json b/environment/docker/sg/config/bootstrap.json
similarity index 100%
rename from environment/sg/config/bootstrap.json
rename to environment/docker/sg/config/bootstrap.json
diff --git a/environment/sg/start-sgw.sh b/environment/docker/sg/start-sgw.sh
similarity index 100%
rename from environment/sg/start-sgw.sh
rename to environment/docker/sg/start-sgw.sh
diff --git a/environment/start_environment.py b/environment/docker/start_environment.py
similarity index 100%
rename from environment/start_environment.py
rename to environment/docker/start_environment.py
diff --git a/environment/telemetry.yml b/environment/docker/telemetry.yml
similarity index 100%
rename from environment/telemetry.yml
rename to environment/docker/telemetry.yml