diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml
index 51b020cd..0c9fd519 100644
--- a/.github/workflows/commits.yml
+++ b/.github/workflows/commits.yml
@@ -11,4 +11,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check if CLA signed
-        uses: canonical/has-signed-canonical-cla@v1
+        uses: canonical/has-signed-canonical-cla@main
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4eb7ca7d..b1aa4cb6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,6 +31,16 @@ jobs:
           # A non-shallow clone is needed for the Differential ShellCheck
           fetch-depth: 0
 
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+
+      - name: Check compatibility with min Go version (1.22.0)
+        run: |
+          set -eux
+          go mod tidy -go=1.22.0
+
       - name: Dependency Review
         uses: actions/dependency-review-action@v4
         if: github.event_name == 'pull_request'
@@ -50,17 +60,6 @@ jobs:
           path: ${{ steps.ShellCheck.outputs.sarif }}
         if: github.event_name == 'pull_request'
 
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.x
-
-      - name: Check compatibility with min Go version (1.22.0)
-        working-directory: microcloud
-        run: |
-          set -eux
-          go mod tidy -go=1.22.0
-
       - name: Install dependencies
         run: |
           sudo add-apt-repository ppa:dqlite/dev -y --no-update
@@ -68,15 +67,12 @@ jobs:
           sudo apt-get install --no-install-recommends -y libdqlite-dev pkg-config
 
       - name: Build
-        working-directory: microcloud
         run: make
 
       - name: Run static analysis
-        working-directory: microcloud
         run: make check-static
 
       - name: Unit tests
-        working-directory: microcloud
         run: make check-unit
 
   system-tests:
@@ -163,7 +159,6 @@ jobs:
           sudo apt-get install --no-install-recommends -y libdqlite-dev pkg-config
 
       - name: Build
-        working-directory: microcloud
         run: |
           set -eux
 
@@ -212,7 +207,7 @@ jobs:
         run: |
           set -eux
           chmod +x ~
-          cd microcloud/test
+          cd test
           sudo --preserve-env=DEBUG,GITHUB_ACTIONS,MICROCLOUD_DEBUG_PATH,MICROCLOUDD_DEBUG_PATH,SKIP_VM_LAUNCH,SNAPSHOT_RESTORE,TEST_STORAGE_SOURCE,TESTBED_READY ./main.sh setup
           echo "TESTBED_READY=1" >> "${GITHUB_ENV}"
 
@@ -220,7 +215,7 @@ jobs:
         run: |
           set -eux
           chmod +x ~
-          cd microcloud/test
+          cd test
           sudo --preserve-env=DEBUG,GITHUB_ACTIONS,MICROCLOUD_DEBUG_PATH,MICROCLOUDD_DEBUG_PATH,SKIP_VM_LAUNCH,SNAPSHOT_RESTORE,TEST_STORAGE_SOURCE,TESTBED_READY ./main.sh ${{ matrix.suite }}
 
   documentation-checks:
diff --git a/microcloud/.golangci.yml b/.golangci.yml
similarity index 100%
rename from microcloud/.golangci.yml
rename to .golangci.yml
diff --git a/microcloud/Makefile b/Makefile
similarity index 100%
rename from microcloud/Makefile
rename to Makefile
diff --git a/microcloud/api/response.go b/api/response.go
similarity index 100%
rename from microcloud/api/response.go
rename to api/response.go
diff --git a/microcloud/api/services.go b/api/services.go
similarity index 100%
rename from microcloud/api/services.go
rename to api/services.go
diff --git a/microcloud/api/services_proxy.go b/api/services_proxy.go
similarity index 100%
rename from microcloud/api/services_proxy.go
rename to api/services_proxy.go
diff --git a/microcloud/api/types/services.go b/api/types/services.go
similarity index 100%
rename from microcloud/api/types/services.go
rename to api/types/services.go
diff --git a/microcloud/client/client.go b/client/client.go
similarity index 100%
rename from microcloud/client/client.go
rename to client/client.go
diff --git a/microcloud/cmd/microcloud/add.go b/cmd/microcloud/add.go
similarity index 100%
rename from microcloud/cmd/microcloud/add.go
rename to cmd/microcloud/add.go
diff --git a/microcloud/cmd/microcloud/ask.go b/cmd/microcloud/ask.go
similarity index 100%
rename from microcloud/cmd/microcloud/ask.go
rename to cmd/microcloud/ask.go
diff --git a/microcloud/cmd/microcloud/cluster_members.go b/cmd/microcloud/cluster_members.go
similarity index 100%
rename from microcloud/cmd/microcloud/cluster_members.go
rename to cmd/microcloud/cluster_members.go
diff --git a/microcloud/cmd/microcloud/input_test.go b/cmd/microcloud/input_test.go
similarity index 100%
rename from microcloud/cmd/microcloud/input_test.go
rename to cmd/microcloud/input_test.go
diff --git a/microcloud/cmd/microcloud/main.go b/cmd/microcloud/main.go
similarity index 100%
rename from microcloud/cmd/microcloud/main.go
rename to cmd/microcloud/main.go
diff --git a/microcloud/cmd/microcloud/main_init.go b/cmd/microcloud/main_init.go
similarity index 100%
rename from microcloud/cmd/microcloud/main_init.go
rename to cmd/microcloud/main_init.go
diff --git a/microcloud/cmd/microcloud/main_init_preseed.go b/cmd/microcloud/main_init_preseed.go
similarity index 100%
rename from microcloud/cmd/microcloud/main_init_preseed.go
rename to cmd/microcloud/main_init_preseed.go
diff --git a/microcloud/cmd/microcloud/main_init_test.go b/cmd/microcloud/main_init_test.go
similarity index 100%
rename from microcloud/cmd/microcloud/main_init_test.go
rename to cmd/microcloud/main_init_test.go
diff --git a/microcloud/cmd/microcloud/preseed_test.go b/cmd/microcloud/preseed_test.go
similarity index 100%
rename from microcloud/cmd/microcloud/preseed_test.go
rename to cmd/microcloud/preseed_test.go
diff --git a/microcloud/cmd/microcloud/selection_table.go b/cmd/microcloud/selection_table.go
similarity index 100%
rename from microcloud/cmd/microcloud/selection_table.go
rename to cmd/microcloud/selection_table.go
diff --git a/microcloud/cmd/microcloud/shutdown.go b/cmd/microcloud/shutdown.go
similarity index 100%
rename from microcloud/cmd/microcloud/shutdown.go
rename to cmd/microcloud/shutdown.go
diff --git a/microcloud/cmd/microcloud/sql.go b/cmd/microcloud/sql.go
similarity index 100%
rename from microcloud/cmd/microcloud/sql.go
rename to cmd/microcloud/sql.go
diff --git a/microcloud/cmd/microcloud/test_console.go b/cmd/microcloud/test_console.go
similarity index 100%
rename from microcloud/cmd/microcloud/test_console.go
rename to cmd/microcloud/test_console.go
diff --git a/microcloud/cmd/microcloud/tokens.go b/cmd/microcloud/tokens.go
similarity index 100%
rename from microcloud/cmd/microcloud/tokens.go
rename to cmd/microcloud/tokens.go
diff --git a/microcloud/cmd/microcloud/waitready.go b/cmd/microcloud/waitready.go
similarity index 100%
rename from microcloud/cmd/microcloud/waitready.go
rename to cmd/microcloud/waitready.go
diff --git a/microcloud/cmd/microcloudd/main.go b/cmd/microcloudd/main.go
similarity index 100%
rename from microcloud/cmd/microcloudd/main.go
rename to cmd/microcloudd/main.go
diff --git a/microcloud/go.mod b/go.mod
similarity index 100%
rename from microcloud/go.mod
rename to go.mod
diff --git a/microcloud/go.sum b/go.sum
similarity index 100%
rename from microcloud/go.sum
rename to go.sum
diff --git a/microcloud/mdns/lookup.go b/mdns/lookup.go
similarity index 100%
rename from microcloud/mdns/lookup.go
rename to mdns/lookup.go
diff --git a/microcloud/mdns/mdns.go b/mdns/mdns.go
similarity index 100%
rename from microcloud/mdns/mdns.go
rename to mdns/mdns.go
diff --git a/microcloud/mdns/version.go b/mdns/version.go
similarity index 100%
rename from microcloud/mdns/version.go
rename to mdns/version.go
diff --git a/microcloud/revive.toml b/revive.toml
similarity index 100%
rename from microcloud/revive.toml
rename to revive.toml
diff --git a/microcloud/service/interface.go b/service/interface.go
similarity index 100%
rename from microcloud/service/interface.go
rename to service/interface.go
diff --git a/microcloud/service/lxd.go b/service/lxd.go
similarity index 100%
rename from microcloud/service/lxd.go
rename to service/lxd.go
diff --git a/microcloud/service/lxd_config.go b/service/lxd_config.go
similarity index 100%
rename from microcloud/service/lxd_config.go
rename to service/lxd_config.go
diff --git a/microcloud/service/lxd_join.go b/service/lxd_join.go
similarity index 100%
rename from microcloud/service/lxd_join.go
rename to service/lxd_join.go
diff --git a/microcloud/service/microceph.go b/service/microceph.go
similarity index 100%
rename from microcloud/service/microceph.go
rename to service/microceph.go
diff --git a/microcloud/service/microcloud.go b/service/microcloud.go
similarity index 100%
rename from microcloud/service/microcloud.go
rename to service/microcloud.go
diff --git a/microcloud/service/microovn.go b/service/microovn.go
similarity index 100%
rename from microcloud/service/microovn.go
rename to service/microovn.go
diff --git a/microcloud/service/service_handler.go b/service/service_handler.go
similarity index 100%
rename from microcloud/service/service_handler.go
rename to service/service_handler.go
diff --git a/microcloud/test/includes/check.sh b/test/includes/check.sh
similarity index 100%
rename from microcloud/test/includes/check.sh
rename to test/includes/check.sh
diff --git a/microcloud/test/includes/microcloud.sh b/test/includes/microcloud.sh
similarity index 99%
rename from microcloud/test/includes/microcloud.sh
rename to test/includes/microcloud.sh
index 8c1f53ba..0e929aa2 100644
--- a/microcloud/test/includes/microcloud.sh
+++ b/test/includes/microcloud.sh
@@ -496,6 +496,7 @@ reset_snaps() {
 # Makes only `num_disks` and `num_ifaces` disks and interfaces available for the next test.
 reset_system() {
   if [ "${SNAPSHOT_RESTORE}" = 1 ]; then
+    # shellcheck disable=SC2048,SC2086
     restore_system ${*}
     return
   fi
@@ -633,6 +634,7 @@ cluster_reset() {
 # reset_systems: Concurrently or sequentially resets the specified number of systems.
 reset_systems() {
   if [ "${SNAPSHOT_RESTORE}" = 1 ]; then
+    # shellcheck disable=SC2048,SC2086
     restore_systems ${*}
     return
   fi
diff --git a/microcloud/test/lint/negated-is-bool.sh b/test/lint/negated-is-bool.sh
similarity index 100%
rename from microcloud/test/lint/negated-is-bool.sh
rename to test/lint/negated-is-bool.sh
diff --git a/microcloud/test/lint/newline-after-block.sh b/test/lint/newline-after-block.sh
similarity index 100%
rename from microcloud/test/lint/newline-after-block.sh
rename to test/lint/newline-after-block.sh
diff --git a/microcloud/test/lint/no-oneline-assign-and-test.sh b/test/lint/no-oneline-assign-and-test.sh
similarity index 100%
rename from microcloud/test/lint/no-oneline-assign-and-test.sh
rename to test/lint/no-oneline-assign-and-test.sh
diff --git a/microcloud/test/lint/no-short-form-imports.sh b/test/lint/no-short-form-imports.sh
similarity index 100%
rename from microcloud/test/lint/no-short-form-imports.sh
rename to test/lint/no-short-form-imports.sh
diff --git a/microcloud/test/main.sh b/test/main.sh
similarity index 100%
rename from microcloud/test/main.sh
rename to test/main.sh
diff --git a/microcloud/test/suites/add.sh b/test/suites/add.sh
similarity index 100%
rename from microcloud/test/suites/add.sh
rename to test/suites/add.sh
diff --git a/microcloud/test/suites/basic.sh b/test/suites/basic.sh
similarity index 100%
rename from microcloud/test/suites/basic.sh
rename to test/suites/basic.sh
diff --git a/microcloud/test/suites/preseed.sh b/test/suites/preseed.sh
similarity index 100%
rename from microcloud/test/suites/preseed.sh
rename to test/suites/preseed.sh
diff --git a/microcloud/version/version.go b/version/version.go
similarity index 100%
rename from microcloud/version/version.go
rename to version/version.go