diff --git a/.github/workflows/check-code-format.yml b/.github/workflows/check-code-format.yml
index b5f942e4..cdab69b1 100644
--- a/.github/workflows/check-code-format.yml
+++ b/.github/workflows/check-code-format.yml
@@ -1,18 +1,10 @@
 name: Check code format
 
-on:
-  push:
-    paths:
-      - '.github/workflows/check-code-format.yml'
-      - 'onchain/rollups/**'
+on: [push]
 
 jobs:
   check-code-format:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: onchain/rollups
-
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29833452..2b0e0249 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,9 +16,6 @@ jobs:
     outputs:
       published: ${{ steps.changeset.outputs.published }}
       version: ${{ steps.get_version.outputs.version }}
-    defaults:
-      run:
-        working-directory: onchain/rollups
 
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +41,6 @@ jobs:
           setupGitUser: false
           commit: "chore: version packages"
           publish: yarn changeset publish
-          cwd: onchain/rollups
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -58,10 +54,6 @@ jobs:
     needs: version_or_publish
     if: ${{ needs.version_or_publish.outputs.published == 'true' }}
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: onchain/rollups
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -88,13 +80,13 @@ jobs:
           VERSION: ${{ needs.version_or_publish.outputs.version }}
 
       - name: Edit Rust package manifest
-        working-directory: onchain/rollups/out/bindings
+        working-directory: out/bindings
         run: |
           tomlq -ti '.package.license = "Apache-2.0"' Cargo.toml
           tomlq -ti '.package.description = "Rust bindings for Cartesi Rollups smart contracts"' Cargo.toml
 
       - name: Publish Rust package to crates.io
-        working-directory: onchain/rollups/out/bindings
+        working-directory: out/bindings
         run: cargo publish
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8df74ad8..f731a527 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,10 +15,6 @@ concurrency:
 jobs:
   test:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: onchain/rollups
-
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.gitmodules b/.gitmodules
index 084528ff..6904b794 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "onchain/rollups/lib/forge-std"]
+[submodule "forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
diff --git a/CODEOWNERS b/CODEOWNERS
index cb7a2268..8f1e42df 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,3 @@
 CODEOWNERS @guidanoli
 /.github/workflows/ @guidanoli
-/onchain/rollups/package.json @pedroargento
+/package.json @pedroargento
diff --git a/README.md b/README.md
index a4e8cf04..94df3039 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,9 @@ git submodule update --init --recursive
 ```
 
 This repository uses [Yarn](https://yarnpkg.com/getting-started/install) to manage JavaScript dependencies.
-In order to install them, please, run the following commands.
+In order to install them, please, run the following command.
 
 ```sh
-cd onchain/rollups
 yarn install
 ```
 
@@ -46,7 +45,7 @@ If the node is not listening to `http://localhost:8545/`, please set the `RPC_UR
 ## 🧪 Tests
 
 If you plan to run the [Forge](https://book.getfoundry.sh/getting-started/installation) tests, there still some setup left to do.
-Assuming you are on the `onchain/rollups` directory, and that [Docker Engine](https://docs.docker.com/get-docker/) is running on the background, you may run the following command.
+Assuming that [Docker Engine](https://docs.docker.com/get-docker/) is running on the background, you may run the following command.
 This command will build the Cartesi Machine image necessary to build the proofs.
 
 ```sh