diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3f5bebc..f82af51 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -46,9 +46,9 @@ jobs:
       # Install whatever version of the JS SDK is in package.json
       - name: Build JS SDK
         run: |
-          cat ./js-sdk/package.json
-          (cd js-sdk && yarn install --frozen-lockfile && yarn build)
-          cp -r ./js-sdk/dist/. ./internal/api/js/chrome/dist
+          cat ./internal/api/js/js-sdk/package.json
+          (cd ./internal/api/js/js-sdk && yarn install --frozen-lockfile && yarn build)
+          cp -r ./internal/api/js/js-sdk/dist/. ./internal/api/js/chrome/dist
 
       - name: Build Rust FFI bindings
         run: |
diff --git a/ENVIRONMENT.md b/ENVIRONMENT.md
index 511018f..030a4de 100644
--- a/ENVIRONMENT.md
+++ b/ENVIRONMENT.md
@@ -29,6 +29,6 @@ The client test matrix to run. Every test is run for each given permutation. The
 - Default: jj,jr,rj,rr
 
 #### `COMPLEMENT_CRYPTO_WRITE_CONTAINER_LOGS`
-If 1, writes container logs to ./tests. Useful as a debugging tool.  
+If 1, writes container logs to ./tests/logs. Useful as a debugging tool.  
 - Type: `bool`
 - Default: 0
diff --git a/js-sdk/index.html b/internal/api/js/js-sdk/index.html
similarity index 100%
rename from js-sdk/index.html
rename to internal/api/js/js-sdk/index.html
diff --git a/js-sdk/package.json b/internal/api/js/js-sdk/package.json
similarity index 100%
rename from js-sdk/package.json
rename to internal/api/js/js-sdk/package.json
diff --git a/js-sdk/vite.config.js b/internal/api/js/js-sdk/vite.config.js
similarity index 100%
rename from js-sdk/vite.config.js
rename to internal/api/js/js-sdk/vite.config.js
diff --git a/js-sdk/yarn.lock b/internal/api/js/js-sdk/yarn.lock
similarity index 100%
rename from js-sdk/yarn.lock
rename to internal/api/js/js-sdk/yarn.lock
diff --git a/rust/matrix_sdk_ffi/matrix_sdk_ffi.c b/internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.c
similarity index 100%
rename from rust/matrix_sdk_ffi/matrix_sdk_ffi.c
rename to internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.c
diff --git a/rust/matrix_sdk_ffi/matrix_sdk_ffi.go b/internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.go
similarity index 100%
rename from rust/matrix_sdk_ffi/matrix_sdk_ffi.go
rename to internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.go
diff --git a/rust/matrix_sdk_ffi/matrix_sdk_ffi.h b/internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.h
similarity index 100%
rename from rust/matrix_sdk_ffi/matrix_sdk_ffi.h
rename to internal/api/rust/matrix_sdk_ffi/matrix_sdk_ffi.h
diff --git a/internal/api/rust/rust.go b/internal/api/rust/rust.go
index e62f711..7a156ae 100644
--- a/internal/api/rust/rust.go
+++ b/internal/api/rust/rust.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/matrix-org/complement-crypto/internal/api"
-	"github.com/matrix-org/complement-crypto/rust/matrix_sdk_ffi"
+	"github.com/matrix-org/complement-crypto/internal/api/rust/matrix_sdk_ffi"
 	"github.com/matrix-org/complement/ct"
 	"github.com/matrix-org/complement/must"
 	"golang.org/x/exp/slices"