diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 367bee0cc..2ae73cb5f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -124,6 +124,7 @@ jobs:
           # Actually do builds and make zips and whatnot
           cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
           echo "cargo dist ran successfully"
+          cat dist-manifest.json
       - id: cargo-dist
         name: Post-build
         # We force bash here just because github makes it really hard to get values up
diff --git a/.gitignore b/.gitignore
index 83b8a221b..2f879c859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,11 @@ device-key.pem
 hsm_secret
 *.so
 .coverage
-libs/Cargo.lock
 *~
 site
 .DS_Store
+target
+Cargo.lock
 
 # These files are auto generated and may contain sensible data that
 # we do not want to check-in!
@@ -16,4 +17,4 @@ tls/users-nobody-key.pem
 tls/users-nobody.pem
 .coverage.*
 .python-version
-docs/.cache
\ No newline at end of file
+docs/.cache
diff --git a/libs/Cargo.lock b/Cargo.lock
similarity index 100%
rename from libs/Cargo.lock
rename to Cargo.lock
diff --git a/libs/Cargo.toml b/Cargo.toml
similarity index 89%
rename from libs/Cargo.toml
rename to Cargo.toml
index 63b493f93..8bb56b4af 100644
--- a/libs/Cargo.toml
+++ b/Cargo.toml
@@ -12,10 +12,10 @@ lto = "thin"
 [workspace]
 resolver = "2"
 members = [
-  "gl-client",
-  "gl-client-py",
-  "gl-plugin",
-  "gl-signerproxy",
+  "libs/gl-client",
+  "libs/gl-client-py",
+  "libs/gl-plugin",
+  "libs/gl-signerproxy",
 ]
 
 [workspace.dependencies]
diff --git a/Makefile b/Makefile
index 5bc0afc5d..c01d829eb 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ clean: clean-rs
 gen: ${GENALL}
 
 build-self: ensure-docker
-	(cd libs; cargo build --all)
+	cargo build --all
 	(cd libs/gl-client-py && python3 -m maturin develop)
 	pip install -e libs/gl-testing
 
diff --git a/libs/gl-testing/Dockerfile b/libs/gl-testing/Dockerfile
index 15b4c9e81..250cc0490 100644
--- a/libs/gl-testing/Dockerfile
+++ b/libs/gl-testing/Dockerfile
@@ -69,8 +69,8 @@ RUN cd /repo/libs/gl-plugin && cargo build --release && \
 # the binaries and we switch from release to debug, simply to keep the
 # docker image size in check
 RUN mkdir -p /tmp/target/debug && \
-    mv /repo/libs/target/release/gl-plugin /tmp/target/debug/ && \
-    mv /repo/libs/target/release/gl-signerproxy /tmp/target/debug/
+    mv /repo/target/release/gl-plugin /tmp/target/debug/ && \
+    mv /repo/target/release/gl-signerproxy /tmp/target/debug/
 
 FROM ubuntu:20.04 as tester
 ARG BITCOIN_VERSION=25.0