diff --git a/.gitignore b/.gitignore
index 80c4e49312..8f62404233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tests/test-artifacts/
 profiling.md
 o1js-reference
 *.tmp.js
+_build/
diff --git a/.gitmodules b/.gitmodules
index b343059624..76a36100bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/snarkyjs-bindings"]
 	path = src/bindings
 	url = https://github.com/o1-labs/snarkyjs-bindings.git
+[submodule "src/mina"]
+	path = src/mina
+	url = https://github.com/MinaProtocol/mina.git
diff --git a/.prettierignore b/.prettierignore
index 099c3fecca..fe67df0c2c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,4 +2,4 @@ src/bindings/compiled/web_bindings/**/plonk_wasm*
 src/bindings/compiled/web_bindings/**/*.bc.js
 src/bindings/compiled/node_bindings/*
 dist/**/*
-src/bindings/kimchi/js/**/*.js
+src/mina/src/lib/crypto/kimchi/js/**/*.js
diff --git a/README-dev.md b/README-dev.md
index 2cd50c025c..7f1446cc65 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -1,74 +1,146 @@
-# How to contribute to the o1js codebase
+# o1js README-dev
 
-This README includes information that is helpful for o1js core contributors.
+o1js is a TypeScript framework designed for zk-SNARKs and zkApps on the Mina blockchain.
 
-## Run examples using Node.js
+- [zkApps Overview](https://docs.minaprotocol.com/zkapps)
+- [Mina README](/src/mina/README.md)
+
+For more information on our development process and how to contribute, see [CONTRIBUTING.md](https://github.com/o1-labs/o1js/blob/main/CONTRIBUTING.md). This document is meant to guide you through building o1js from source and understanding the development workflow.
+
+## Prerequisites
+
+Before starting, ensure you have the following tools installed:
+
+- [Git](https://git-scm.com/)
+- [Node.js and npm](https://nodejs.org/)
+- [Dune](https://github.com/ocaml/dune) (only needed when compiling o1js from source)
+- [Cargo](https://www.rust-lang.org/learn/get-started) (only needed when compiling o1js from source)
+
+After cloning the repository, you need to fetch the submodules:
+
+```sh
+git submodule update --init --recursive
+```
+
+## Building o1js
+
+For most users, building o1js is as simple as running:
 
 ```sh
 npm install
 npm run build
-
-./run src/examples/api_exploration.ts
 ```
 
-## Build and run the web version
+This will compile the TypeScript source files, making it ready for use. The compiled OCaml and WebAssembly artifacts are version-controlled to simplify the build process for end-users. These artifacts are stored under `src/bindings/compiled`, and contain the artifacts needed for both node and web builds. These files do not have to be regenerated unless there are changes to the OCaml or Rust source files.
+
+## Building Bindings
+
+If you need to regenerate the OCaml and WebAssembly artifacts, you can do so within the o1js repo. The [bindings](https://github.com/o1-labs/o1js-bindings) and [Mina](https://github.com/MinaProtocol/mina) repos are both submodules of o1js, so you can build them from within the o1js repo.
+
+o1js depends on OCaml code that is transpiled to JavaScript using [Js_of_ocaml](https://github.com/ocsigen/js_of_ocaml), and Rust code that is transpiled to WebAssembly using [wasm-pack](https://github.com/rustwasm/wasm-pack). These artifacts allow o1js to call into [Pickles](https://github.com/o1-labs/snarkyhttps://github.com/MinaProtocol/mina/blob/develop/src/lib/pickles/README.md), [snarky](https://github.com/o1-labs/snarky), and [Kimchi](https://github.com/o1-labs/proof-systems) to write zk-SNARKs and zkApps.
+
+The compiled artifacts are stored under `src/bindings/compiled`, and are version-controlled to simplify the build process for end-users.
+
+If you wish to rebuild the OCaml and Rust artifacts, you must be able to build the Mina repo before building the bindings. See the [Mina Dev Readme](https://github.com/MinaProtocol/mina/blob/develop/README-dev.md) for more information. Once you have configured your environment to build Mina, you can build the bindings:
 
 ```sh
-npm install
-npm run build:web
-npm run serve:web
+npm run build:update-bindings
 ```
 
-To see the test running in a web browser, go to `http://localhost:8000/`.
+This will build the OCaml and Rust artifacts, and copy them to the `src/bindings/compiled` directory.
+
+### Build Scripts
+
+The root build script which kicks off the build process is under `src/bindings/scripts/update-snarkyjs-bindings.sh`. This script is responsible for building the Node.js and web artifacts for o1js, and places them under `src/bindings/compiled`, to be used by o1js.
+
+### OCaml Bindings
+
+o1js depends on Pickles, snarky, and parts of the Mina transaction logic, all of which are compiled to JavaScript and stored as artifacts to be used by o1js natively. The OCaml bindings are located under `src/bindings`. See the [OCaml Bindings README](https://github.com/o1-labs/o1js-bindings/blob/main/README.md) for more information.
+
+To compile the OCaml code, a build tool called Dune is used. Dune is a build system for OCaml projects, and is used in addition with Js_of_ocaml to compile the OCaml code to JavaScript. The dune file that is responsible for compiling the OCaml code is located under `src/bindings/ocaml/dune`. There are two build targets: `snarky_js_node` and `snarky_js_web`, which compile the Mina dependencies as well as link the wasm artifacts to build the Node.js and web artifacts, respectively. The output file is `snark_js_node.bc.js`, which is used by o1js.
+
+### WebAssembly Bindings
+
+o1js additionally depends on Kimchi, which is compiled to WebAssembly. Kimchi is located in the Mina repo, under `src/mina`. See the [Kimchi README](https://github.com/o1-labs/proof-systems/blob/master/README.md) for more information.
 
-## Run tests
+To compile the wasm code, a combination of Cargo and Dune is used. Both build files are located under `src/mina/src/lib/crypto/kimchi`, where the `wasm` folder contains the Rust code which is compiled to wasm, and the `js` folder which contains a wrapper around the wasm code which allows Js_of_ocaml to compile against the wasm backend.
 
-- Unit tests
+For the wasm build, the output files are:
 
-  ```sh
-  npm run test
-  npm run test:unit
-  ```
+- `plonk_wasm_bg.wasm`: The compiled WebAssembly binary.
+- `plonk_wasm_bg.wasm.d.ts`: TypeScript definition files describing the types of .wasm or .js files.
+- `plonk_wasm.js`: JavaScript file that wraps the WASM code for use in Node.js.
+- `plonk_wasm.d.ts`: TypeScript definition file for plonk_wasm.js.
 
-- Integration tests
+### Generated Constant Types
 
-  ```sh
-  npm run test:integration
-  ```
+In addition to building the OCaml and Rust code, the build script also generates TypeScript types for constants used in the Mina protocol. These types are generated from the OCaml source files, and are located under `src/bindings/crypto/constants.ts` and `src/bindings/mina-transaction/gen`. When building the bindings, these constants are auto-generated by Dune. If you wish to add a new constant, you can edit the `src/bindings/ocaml/snarky_js_constants` file, and then run `npm run build:bindings` to regenerate the TypeScript files.
 
-- E2E tests
+These types are used by o1js to ensure that the constants used in the protocol are consistent with the OCaml source files.
 
-  ```sh
-  npm install
-  npm run e2e:install
-  npm run build:web
+## Development
 
-  npm run e2e:prepare-server
-  npm run test:e2e
-  npm run e2e:show-report
-  ```
+### Branch Compatibility
 
-## Branch Compatibility
+If you work on o1js, create a feature branch off of one of these base branches. It's encouraged to submit your work-in-progress as a draft PR to raise visibility! When working with submodules and various interconnected parts of the stack, ensure you are on the correct branches that are compatible with each other.
 
-o1js is mostly used to write Mina Smart Contracts and must be compatible with the latest Berkeley Testnet, or soon Mainnet. 
+#### How to Use the Branches
 
-The OCaml code is in the o1js-bindings repository, not directly in o1js.
+**Default to `main` as the base branch**.
 
-To maintain compatibility between the repositories and build o1js from the [Mina repository](https://github.com/MinaProtocol/mina), make changes to its core, such as the OCaml-bindings in the [o1js-bindings repository](https://github.com/o1-labs/o1js-bindings), you must follow a certain branch compatibility pattern:
+The other base branches (`berkeley`, `develop`) are only used in specific scenarios where you want to adapt o1js to changes in the sibling repos on those other branches. Even then, consider whether it is feasible to land your changes to `main` and merge to `berkeley` and `develop` afterwards. Only changes in `main` will ever be released, so anything in the other branches has to be backported and reconciled with `main` eventually.
 
-The following branches are compatible:
+| Repository | mina -> o1js -> o1js-bindings    |
+| ---------- | -------------------------------- |
+| Branches   | o1js-main -> main -> main        |
+|            | berkeley -> berkeley -> berkeley |
+|            | develop -> develop -> develop    |
 
-| repository | mina -> o1js -> o1js-bindings |
-| ---------- | ------------------------------------- |
-| branches   | rampup -> main -> main                |
-|            | berkeley -> berkeley -> berkeley      |
-|            | develop -> develop -> develop         |
+- `o1js-main`: The o1js-main branch in the Mina repository corresponds to the main branch in both o1js and o1js-bindings repositories. This is where stable releases and ramp-up features are maintained.
 
-## Run the GitHub actions locally
+- `berkeley`: The berkeley branch is maintained across all three repositories. This branch is used for features and updates specific to the Berkeley release of the project.
+
+- `develop`: The develop branch is also maintained across all three repositories. It is used for ongoing development, testing new features, and integration work.
+
+### Running Tests
+
+To ensure your changes don't break existing functionality, run the test suite:
+
+```sh
+npm run test
+npm run test:unit
+```
+
+This will run all the unit tests and provide you with a summary of the test results.
+
+You can additionally run integration tests by running:
+
+```sh
+npm run test:integration
+```
+
+Finally, we have a set of end-to-end tests that run against the browser. These tests are not run by default, but you can run them by running:
+
+```sh
+npm install
+npm run e2e:install
+npm run build:web
+
+npm run e2e:prepare-server
+npm run test:e2e
+npm run e2e:show-report
+```
+
+### Run the GitHub actions locally
 
 <!-- The test example should stay in sync with a real value set in .github/workflows/build-actions.yml -->
+
 You can execute the CI locally by using [act](https://github.com/nektos/act). First generate a GitHub token and use:
-```
+
+```sh
 act -j Build-And-Test-Server --matrix test_type:"Simple integration tests" -s $GITHUB_TOKEN
 ```
-to execute the job "Build-And-Test-Server for the test type `Simple integration tests`.
+
+### Releasing
+
+To release a new version of o1js, you must first update the version number in `package.json`. Then, you can create a new pull request to merge your changes into the main branch. Once the pull request is merged, a CI job will automatically publish the new version to npm.
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000000..7b17fb2d30
--- /dev/null
+++ b/dune-project
@@ -0,0 +1 @@
+(lang dune 3.3)
diff --git a/jest.config.js b/jest.config.js
index b24c895d96..7f6d944074 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,6 +3,7 @@ export default {
   testEnvironment: 'node',
   extensionsToTreatAsEsm: ['.ts'],
   transformIgnorePatterns: ['node_modules/', 'dist/node/'],
+  modulePathIgnorePatterns: ['src/mina/'],
   globals: {
     'ts-jest': {
       useESM: true,
diff --git a/package.json b/package.json
index 1ade0ac845..33d4096bc4 100644
--- a/package.json
+++ b/package.json
@@ -44,10 +44,10 @@
   "scripts": {
     "type-check": "tsc --noEmit",
     "dev": "npx tsc -p tsconfig.node.json && node src/build/copy-to-dist.js",
-    "make": "make -C ../../.. snarkyjs",
-    "make:no-types": "npm run clean && make -C ../../.. snarkyjs_no_types",
-    "bindings": "cd ../../.. && ./scripts/update-snarkyjs-bindings.sh && cd src/lib/snarkyjs",
     "build": "node src/build/copy-artifacts.js && rimraf ./dist/node && npm run dev && node src/build/buildNode.js",
+    "build:bindings": "./src/bindings/scripts/build-snarkyjs-node.sh",
+    "build:update-bindings": "./src/bindings/scripts/update-snarkyjs-bindings.sh",
+    "build:wasm": "./src/bindings/scripts/update-wasm-and-types.sh",
     "build:test": "npx tsc -p tsconfig.test.json && cp src/snarky.d.ts dist/node/snarky.d.ts",
     "build:node": "npm run build",
     "build:web": "rimraf ./dist/web && node src/build/buildWeb.js",
diff --git a/src/bindings b/src/bindings
index 6d5cdbd34d..f5fa4cabe5 160000
--- a/src/bindings
+++ b/src/bindings
@@ -1 +1 @@
-Subproject commit 6d5cdbd34d30d3d2b61ef021b311dac7741ab188
+Subproject commit f5fa4cabe536014af4c3ad00700f1b267d4956e3
diff --git a/src/mina b/src/mina
new file mode 160000
index 0000000000..4c9d45ce46
--- /dev/null
+++ b/src/mina
@@ -0,0 +1 @@
+Subproject commit 4c9d45ce46afd65ff18dc5f3ff8648cd87c9c697
diff --git a/tsconfig.json b/tsconfig.json
index 569ef2b1e6..7eb2e0ba4d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "include": ["./src/**/*.ts"],
-  "exclude": ["./src/**/*.bc.js", "./src/build", "./src/examples"],
+  "exclude": ["./src/**/*.bc.js", "./src/build", "./src/examples", "./src/mina"],
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "dist",