diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd7238dad61..e4afb837e09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1002,6 +1002,17 @@ jobs:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
+        
+  guides-sample-dapp:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   e2e-canary-test:
     machine:
@@ -1443,6 +1454,7 @@ workflows:
       - cli-docs-sandbox: *e2e_test
       - guides-writing-an-account-contract: *e2e_test
       - guides-dapp-testing: *e2e_test
+      - guides-sample-dapp: *e2e_test
 
       - e2e-end:
           requires:
@@ -1476,6 +1488,7 @@ workflows:
             - cli-docs-sandbox
             - guides-writing-an-account-contract
             - guides-dapp-testing
+            - guides-sample-dapp
           <<: *defaults
 
       - deploy-dockerhub:
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 51102ba9694..bb18cd9a1d3 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
-  ".": "0.6.6",
-  "circuits/cpp/barretenberg": "0.6.6",
-  "circuits/cpp/barretenberg/ts": "0.6.6"
+  ".": "0.6.7",
+  "circuits/cpp/barretenberg": "0.6.7",
+  "circuits/cpp/barretenberg/ts": "0.6.7"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a1c4a5b52c..4192d1e02d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.6...aztec-packages-v0.6.7) (2023-09-11)
+
+
+### Features
+
+* Testing commands in CLI docs ([#2119](https://github.com/AztecProtocol/aztec-packages/issues/2119)) ([73328db](https://github.com/AztecProtocol/aztec-packages/commit/73328dbe4e509235329e32ff88f823d849a2b673))
+
+
+### Bug Fixes
+
+* Add homepage url to aztec.js package.json ([#2196](https://github.com/AztecProtocol/aztec-packages/issues/2196)) ([7361302](https://github.com/AztecProtocol/aztec-packages/commit/7361302b0b06bc218d287da56cabd7f567cd6aa3))
+* **ci:** Add install backend step in noir rebuild ([#2182](https://github.com/AztecProtocol/aztec-packages/issues/2182)) ([27b8bed](https://github.com/AztecProtocol/aztec-packages/commit/27b8bed05fea4f44f36894739613b07cdb8089ac))
+* Use Github Bot token for dispatch workflow ([#2171](https://github.com/AztecProtocol/aztec-packages/issues/2171)) ([e6af616](https://github.com/AztecProtocol/aztec-packages/commit/e6af6164095a706109a6f61ef7e1196de67716dc))
+
 ## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.5...aztec-packages-v0.6.6) (2023-09-11)
 
 
diff --git a/VERSION b/VERSION
index fe152d6af84..9502cd8069c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.6.6 x-release-please-version
+v0.6.7 x-release-please-version
diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo
index 46ee2fd938e..c85091d5509 100644
--- a/circuits/cpp/barretenberg/.gitrepo
+++ b/circuits/cpp/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 4a9f5cc359b5416861c495a5245e089fcf17b3c4
-	parent = 4318b62128b59e867d488a35613b81e5f4e9172c
+	commit = cf0390a15a04bec10feb77d305edc03e22aa6556
+	parent = e1e14d2c7fb44d56b9a10a645676d3551830bb10
 	method = merge
 	cmdver = 0.4.6
diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md
index 412af9b65a9..c982314138c 100644
--- a/circuits/cpp/barretenberg/CHANGELOG.md
+++ b/circuits/cpp/barretenberg/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.6...barretenberg-v0.6.7) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.5...barretenberg-v0.6.6) (2023-09-11)
 
 
diff --git a/circuits/cpp/barretenberg/VERSION b/circuits/cpp/barretenberg/VERSION
index fe152d6af84..9502cd8069c 100644
--- a/circuits/cpp/barretenberg/VERSION
+++ b/circuits/cpp/barretenberg/VERSION
@@ -1 +1 @@
-v0.6.6 x-release-please-version
+v0.6.7 x-release-please-version
diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/circuits/cpp/barretenberg/barretenberg-wasm.nix
index 7ebdaec86e9..b77203afb96 100644
--- a/circuits/cpp/barretenberg/barretenberg-wasm.nix
+++ b/circuits/cpp/barretenberg/barretenberg-wasm.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation
 {
   pname = "barretenberg.wasm";
-  version = "0.6.6"; # x-release-please-version
+  version = "0.6.7"; # x-release-please-version
 
   src = ./cpp;
 
diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/circuits/cpp/barretenberg/barretenberg.nix
index f82fa08b206..2f44f94812d 100644
--- a/circuits/cpp/barretenberg/barretenberg.nix
+++ b/circuits/cpp/barretenberg/barretenberg.nix
@@ -14,7 +14,7 @@ in
 buildEnv.mkDerivation
 {
   pname = "libbarretenberg";
-  version = "0.6.6"; # x-release-please-version
+  version = "0.6.7"; # x-release-please-version
 
   src = ./cpp;
 
diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/CMakeLists.txt
index f1825eea176..7d32cfff096 100644
--- a/circuits/cpp/barretenberg/cpp/CMakeLists.txt
+++ b/circuits/cpp/barretenberg/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.6.6 # x-release-please-version
+    VERSION 0.6.7 # x-release-please-version
     LANGUAGES CXX C
 )
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
index f6d4580fadf..69425fcd971 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
@@ -9,9 +9,8 @@ auto& engine = numeric::random::get_debug_engine();
 }
 
 using FF = barretenberg::fr;
-using barretenberg::Univariate;
 using barretenberg::BarycentricData;
-
+using barretenberg::Univariate;
 
 namespace proof_system::benchmark {
 
@@ -19,8 +18,7 @@ void extend_2_to_6(State& state) noexcept
 {
     auto univariate = Univariate<FF, 2>::get_random();
     BarycentricData<FF, 2, 6> barycentric_2_to_6;
-    for (auto _ : state)
-    {
+    for (auto _ : state) {
         DoNotOptimize(barycentric_2_to_6.extend(univariate));
     }
 }
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
index 56568cbbf11..bccb233a4f9 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
@@ -5,13 +5,13 @@
 
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 using namespace proof_system::honk;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
index 777242c05f2..ec3196186ef 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
@@ -8,13 +8,13 @@
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
 #include "barretenberg/honk/proof_system/ultra_prover.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/plookup_tables/types.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 using namespace proof_system::honk;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
index 894fe54304d..37049f21866 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
@@ -1,5 +1,9 @@
 #pragma once
 #include "barretenberg/honk/pcs/kzg/kzg.hpp"
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
@@ -7,10 +11,6 @@
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 
 namespace proof_system::honk::flavor {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
index c0a4a53776e..55006bdfaa9 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/honk/pcs/kzg/kzg.hpp"
-#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
@@ -10,6 +8,8 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 
 namespace proof_system::honk::flavor {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
index 957c52aceb4..dbb013241b0 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
@@ -4,13 +4,13 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
-#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include <array>
 #include <concepts>
 #include <span>
@@ -226,8 +226,8 @@ class StandardGrumpkin {
      * @todo TODO(#390): Simplify this by moving MAX_RELATION_LENGTH?
      */
     template <size_t MAX_RELATION_LENGTH>
-    using ExtendedEdges =
-        AllEntities<barretenberg::Univariate<FF, MAX_RELATION_LENGTH>, barretenberg::Univariate<FF, MAX_RELATION_LENGTH>>;
+    using ExtendedEdges = AllEntities<barretenberg::Univariate<FF, MAX_RELATION_LENGTH>,
+                                      barretenberg::Univariate<FF, MAX_RELATION_LENGTH>>;
 
     /**
      * @brief A container for the polynomials evaluations produced during sumcheck, which are purported to be the
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
index 1323ed98874..df21ba0ce55 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
@@ -4,17 +4,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 
 namespace proof_system::honk::flavor {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
index 260b2f44b76..609421f74c6 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
@@ -5,17 +5,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include <array>
 #include <concepts>
 #include <span>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
index e050d7b6597..9d98f4a1c25 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
@@ -5,17 +5,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 #include <array>
 #include <concepts>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
index 53405a3aede..acb530965c6 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include "barretenberg/common/constexpr_utils.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/common/constexpr_utils.hpp"
 #include <typeinfo>
 
 namespace proof_system::honk::grand_product_library {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
index af679985ff3..c43a5e69926 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
@@ -1,11 +1,11 @@
 
-#include "prover_library.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/honk/flavor/standard.hpp"
 #include "barretenberg/honk/flavor/ultra.hpp"
 #include "barretenberg/honk/proof_system/grand_product_library.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "prover.hpp"
+#include "prover_library.hpp"
 
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include <array>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
index 5f4a5460a3f..9aeea1327fc 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
@@ -5,10 +5,10 @@
 #include "barretenberg/honk/pcs/gemini/gemini.hpp"
 #include "barretenberg/honk/pcs/shplonk/shplonk.hpp"
 #include "barretenberg/honk/proof_system/work_queue.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 namespace proof_system::honk {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
index 884bc3e31c4..ea98cc35c46 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
@@ -271,8 +271,7 @@ TEST_F(RelationCorrectnessTests, StandardRelationCorrectness)
     grand_product_library::compute_grand_products<honk::flavor::Standard>(prover.key, prover_polynomials, params);
 
     // Construct the round for applying sumcheck relations and results for storing computed results
-    auto relations =
-        std::tuple(proof_system::ArithmeticRelation<FF>(), proof_system::PermutationRelation<FF>());
+    auto relations = std::tuple(proof_system::ArithmeticRelation<FF>(), proof_system::PermutationRelation<FF>());
 
     // Check that each relation is satisfied across each row of the prover polynomials
     check_relation<Flavor>(std::get<0>(relations), circuit_size, prover_polynomials, params);
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
index e3f0ae21409..e3702752e40 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
@@ -2,11 +2,11 @@
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "sumcheck_round.hpp"
 
 namespace proof_system::honk::sumcheck {
@@ -70,8 +70,9 @@ template <typename Flavor> class SumcheckProver {
      *
      * @details
      */
-    SumcheckOutput<Flavor> prove(auto full_polynomials,
-                                 const proof_system::RelationParameters<FF>& relation_parameters) // pass by value, not by reference
+    SumcheckOutput<Flavor> prove(
+        auto full_polynomials,
+        const proof_system::RelationParameters<FF>& relation_parameters) // pass by value, not by reference
     {
         auto [alpha, zeta] = transcript.get_challenges("Sumcheck:alpha", "Sumcheck:zeta");
 
@@ -172,7 +173,8 @@ template <typename Flavor> class SumcheckVerifier {
      * @param relation_parameters
      * @param transcript
      */
-    std::optional<SumcheckOutput<Flavor>> verify(const proof_system::RelationParameters<FF>& relation_parameters, auto& transcript)
+    std::optional<SumcheckOutput<Flavor>> verify(const proof_system::RelationParameters<FF>& relation_parameters,
+                                                 auto& transcript)
     {
         bool verified(true);
 
@@ -192,8 +194,9 @@ template <typename Flavor> class SumcheckVerifier {
         for (size_t round_idx = 0; round_idx < multivariate_d; round_idx++) {
             // Obtain the round univariate from the transcript
             std::string round_univariate_label = "Sumcheck:univariate_" + std::to_string(round_idx);
-            auto round_univariate = transcript.template receive_from_prover<
-                barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>>(round_univariate_label);
+            auto round_univariate =
+                transcript.template receive_from_prover<barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>>(
+                    round_univariate_label);
 
             bool checked = round.check_sum(round_univariate);
             verified = verified && checked;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
index fba343da147..1d1b77e2115 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
@@ -1,4 +1,3 @@
-#include "sumcheck.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
@@ -11,6 +10,7 @@
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
+#include "sumcheck.hpp"
 #include <gtest/gtest.h>
 
 using namespace proof_system::honk;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
index 1b72039573a..42dad089601 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
@@ -121,10 +121,11 @@ template <typename Flavor> class SumcheckProverRound {
      * values. Most likely this will end up being S_l(0), ... , S_l(t-1) where t is around 12. At the end, reset all
      * univariate accumulators to be zero.
      */
-    barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH> compute_univariate(auto& polynomials,
-                                                                  const proof_system::RelationParameters<FF>& relation_parameters,
-                                                                  const barretenberg::PowUnivariate<FF>& pow_univariate,
-                                                                  const FF alpha)
+    barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH> compute_univariate(
+        auto& polynomials,
+        const proof_system::RelationParameters<FF>& relation_parameters,
+        const barretenberg::PowUnivariate<FF>& pow_univariate,
+        const FF alpha)
     {
         // Precompute the vector of required powers of zeta
         // TODO(luke): Parallelize this
@@ -440,12 +441,12 @@ template <typename Flavor> class SumcheckVerifierRound {
      * @param round_challenge u_l
      * @return FF sigma_{l+1} = S^l(u_l)
      */
-    FF compute_next_target_sum(barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>& univariate, FF& round_challenge)
+    FF compute_next_target_sum(barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>& univariate,
+                               FF& round_challenge)
     {
         // IMPROVEMENT(Cody): Use barycentric static method, maybe implement evaluation as member
         // function on Univariate.
-        auto barycentric =
-            barretenberg::BarycentricData<FF, MAX_RANDOM_RELATION_LENGTH, MAX_RANDOM_RELATION_LENGTH>();
+        auto barycentric = barretenberg::BarycentricData<FF, MAX_RANDOM_RELATION_LENGTH, MAX_RANDOM_RELATION_LENGTH>();
         // Evaluate T^{l}(u_{l})
         target_total_sum = barycentric.evaluate(univariate, round_challenge);
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
index e6089f875d1..33cc485cb2f 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
@@ -20,9 +20,9 @@ using namespace proof_system::honk;
 using namespace proof_system::honk::sumcheck;
 using namespace proof_system;
 
-using barretenberg::Univariate;
-using barretenberg::PowUnivariate;
 using barretenberg::BarycentricData;
+using barretenberg::PowUnivariate;
+using barretenberg::Univariate;
 
 using Flavor = flavor::Standard;
 using FF = typename Flavor::FF;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
index 89b26fa53fd..8865e473fda 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
@@ -2,8 +2,8 @@
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/honk/flavor/standard.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "transcript.hpp"
 #include <gtest/gtest.h>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
index 2dcda2c229d..a166fc5beac 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
@@ -1,5 +1,5 @@
-#include "barycentric.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barycentric.hpp"
 #include <gtest/gtest.h>
 
 namespace barretenberg::test_barycentric {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
index 9c5a725d159..58355c453c6 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
@@ -1,5 +1,5 @@
-#include "pow.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "pow.hpp"
 #include <gtest/gtest.h>
 
 namespace barretenberg::test_pow {
@@ -18,14 +18,14 @@ TEST(SumcheckPow, FullPowConsistency)
         u_i = FF::random_element();
         pow_univariate.partially_evaluate(u_i);
     }
-    
+
     FF zeta_power = zeta;
     FF expected_eval = 1;
     for (auto& u_i : variables) {
         expected_eval *= FF(1) - u_i + u_i * zeta_power;
         zeta_power *= zeta_power;
     }
-    
+
     EXPECT_EQ(pow_univariate.partial_evaluation_constant, expected_eval);
 }
 } // namespace barretenberg::test_pow
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
index af934fe7069..7f6baf00b4c 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
@@ -65,8 +65,8 @@
 
 #pragma once
 #include "barretenberg/polynomials/barycentric.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/types/circuit_type.hpp"
 #include <array>
 #include <concepts>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
index 91997903d8c..05078bf638f 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
@@ -8,7 +8,7 @@ namespace proof_system {
 template <typename FF_> class AuxiliaryRelationImpl {
   public:
     using FF = FF_;
-    
+
     // 1 + polynomial degree of this relation
     static constexpr size_t RELATION_LENGTH = 6;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
index 972f98e6ed4..a267e673552 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
@@ -14,7 +14,7 @@ template <typename FF_> class PermutationRelationImpl {
 
     static constexpr size_t LEN_1 = 5; // grand product construction sub-relation
     static constexpr size_t LEN_2 = 3; // left-shiftable polynomial sub-relation
-    static constexpr std::tuple<size_t, size_t> SUBRELATION_LENGTHS = {LEN_1, LEN_2};
+    static constexpr std::tuple<size_t, size_t> SUBRELATION_LENGTHS = { LEN_1, LEN_2 };
     template <template <size_t...> typename SubrelationAccumulatorsTemplate>
     using GetAccumulatorTypes = SubrelationAccumulatorsTemplate<LEN_1, LEN_2>;
     template <typename T> using Accumulator = typename std::tuple_element<0, typename T::Accumulators>::type;
diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md
index b224fc4d353..1dcbdc136f6 100644
--- a/circuits/cpp/barretenberg/ts/CHANGELOG.md
+++ b/circuits/cpp/barretenberg/ts/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.6...barretenberg.js-v0.6.7) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
 ## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.5...barretenberg.js-v0.6.6) (2023-09-11)
 
 
diff --git a/circuits/cpp/barretenberg/ts/package.json b/circuits/cpp/barretenberg/ts/package.json
index 3b10a1613c8..31c190ac4f2 100644
--- a/circuits/cpp/barretenberg/ts/package.json
+++ b/circuits/cpp/barretenberg/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts",
   "license": "MIT",
   "type": "module",
diff --git a/docs/.gitrepo b/docs/.gitrepo
index 586639dbe05..7c9f408755a 100644
--- a/docs/.gitrepo
+++ b/docs/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/docs
 	branch = main
-	commit = 76da28406fa55dc0f34dbed9014d68391e6ef18e
-	parent = 73328dbe4e509235329e32ff88f823d849a2b673
+	commit = d624ccc3f4da16b453bfde04fc712f61313b50bd
+	parent = dcc927c9aa347cd305cecd260cfedfb5cda0454f
 	method = merge
 	cmdver = 0.4.6
diff --git a/docs/docs/dev_docs/contracts/state_variables.md b/docs/docs/dev_docs/contracts/state_variables.md
index e2e7242f793..d11e7fb8b2d 100644
--- a/docs/docs/dev_docs/contracts/state_variables.md
+++ b/docs/docs/dev_docs/contracts/state_variables.md
@@ -28,7 +28,7 @@ The BoolSerialisationMethods is part of the Aztec stdlib:
 
 It contains methods that instruct its PublicState wrapper how to serialise and deserialise a boolean to and from a Field, which is the data type being saved in the public state tree.
 
-The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation) for the complete list.
+The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation) for the complete list.
 
 ### Custom types
 
@@ -36,7 +36,7 @@ It's possible to create a public state for any types. Simply define methods that
 
 The methods should be implemented in a struct that conforms to the following interface:
 
-#include_code TypeSerialisationInterface /yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr rust
+#include_code TypeSerialisationInterface /yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr rust
 
 For example, to create a public state for the following type:
 
@@ -118,7 +118,7 @@ Notes are the fundamental elements in the private world.
 
 A note should conform to the following interface:
 
-#include_code NoteInterface /yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr rust
+#include_code NoteInterface /yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr rust
 
 The interplay between a private state variable and its notes can be confusing. Here's a summary to aid intuition:
 
@@ -243,7 +243,7 @@ Because of this limit, we should always consider using the second argument `Note
 
 `NoteGetterOptions` encapsulates a set of configurable options for filtering and retrieving a selection of notes from a database:
 
-#include_code NoteGetterOptions /yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr rust
+#include_code NoteGetterOptions /yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr rust
 
 Developers can design instances of `NoteGetterOptions`, to determine how notes should be filtered and returned to the functions of their smart contracts.
 
diff --git a/docs/docs/dev_docs/dapps/tutorials/contract_deployment.md b/docs/docs/dev_docs/dapps/tutorials/contract_deployment.md
index a2cc9d4f044..9bbbbdc3669 100644
--- a/docs/docs/dev_docs/dapps/tutorials/contract_deployment.md
+++ b/docs/docs/dev_docs/dapps/tutorials/contract_deployment.md
@@ -1,3 +1,107 @@
----
-title: Contract Deployment
----
+# Contract Deployment
+
+To add contracts to your application, we'll start by creating a new `nargo` project. We'll then compile the contracts, and write a simple script to deploy them to our Sandbox.
+
+:::info
+Follow the instructions [here](../../getting_started/noir_contracts.md) to install `nargo` if you haven't done so already.
+:::
+
+## Initialise nargo project
+
+Create a new `contracts` folder, and from there, initialise a new project called `private_token`:
+
+```sh
+mkdir contracts && cd contracts
+nargo new --contract private_token
+```
+
+Then, open the `contracts/private_token/Nargo.toml` configuration file, and add the `aztec.nr` and `value_note` libraries as dependencies:
+
+```toml
+[dependencies]
+aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/noir-aztec" }
+value_note = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/value-note" }
+```
+
+Last, copy-paste the code from the `PrivateToken` contract into `contracts/private_token/main.nr`:
+
+#include_code all yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr rust
+
+## Compile your contract
+
+We'll now use the [Aztec CLI](../../cli/main.md) to [compile](../../contracts/compiling.md) our project. If you haven't installed the CLI already, you can install it locally to your project running:
+
+```sh
+yarn add -D @aztec/cli
+```
+
+Now run the following from your project root:
+
+```sh
+yarn aztec-cli compile contracts/private_token
+```
+
+:::info
+If you are using Typescript, consider including the `--typescript` option to [generate type-safe wrappers](../../contracts/compiling.md#typescript-interfaces) for your contracts.
+:::
+
+This should have created an artifact `contracts/private_token/target/private_token-Main.json` with the interface and bytecode for your contract.
+
+## Adding a second contract
+
+For the purposes of this tutorial, we'll set up a second contract: a public token contract. Follow the same steps as above for initialising a new Nargo project, include the dependencies, and copy-paste the following code into `contracts/public_token/main.nr`:
+
+#include_code all yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+
+Compile the contract with the CLI:
+
+```sh
+yarn aztec-cli compile contracts/public_token
+```
+
+With both contracts ready, we'll now proceed to deployment.
+
+## Deploy your contracts
+
+Let's now write a script for deploying your contracts to the Sandbox. We'll create an RPC client, and then use the `ContractDeployer` class to deploy our contracts, and store the deployment address to a local JSON file.
+
+Create a new file `src/deploy.mjs`, importing the contract artifacts we have generated plus the dependencies we'll need, and with a call to a `main` function that we'll populate in a second:
+
+```js
+// src/deploy.mjs
+import { writeFileSync } from 'fs';
+import { createAztecRpcClient, ContractDeployer } from '@aztec/aztec.js';
+import PrivateTokenArtifact from '../contracts/private_token/target/PrivateToken.json' assert { type: 'json' };
+import PublicTokenArtifact from '../contracts/public_token/target/PublicToken.json' assert { type: 'json' };
+
+async function main() { }
+
+main().catch(err => {
+  console.error(`Error in deployment script: ${err}`);
+  process.exit(1);
+});
+```
+
+Now we can deploy the contracts by adding the following code to the `src/deploy.mjs` file. Here, we are using the `ContractDeployer` class with the compiled artifact to send a new deployment transaction. The `wait` method will block execution until the transaction is successfully mined, and return a receipt with the deployed contract address. 
+
+#include_code dapp-deploy yarn-project/end-to-end/src/sample-dapp/deploy.mjs javascript
+
+Note that the private token constructor expects an `owner` address to mint an initial set of tokens to. We are using the first account from the Sandbox for this.
+
+:::info
+If you are using the generated typescript classes, you can drop the generic `ContractDeployer` in favor of using the `deploy` method of the generated class, which will automatically load the artifact for you and type-check the constructor arguments:
+
+```typescript
+await PrivateToken.deploy(client, 100n, owner.address).send().wait();
+```
+:::
+
+Run the snippet above as `node src/deploy.mjs`, and you should see the following output, along with a new `addresses.json` file in your project root:
+
+```text
+Private token deployed to 0x2950b0f290422ff86b8ee8b91af4417e1464ddfd9dda26de8af52dac9ea4f869
+Public token deployed to 0x2b54f68fd1e18f7dcfa71e3be3c91bb06ecbe727a28d609e964c225a4b5549c8
+```
+## Next steps
+
+Now that we have our contracts set up, it's time to actually [start writing our application that will be interacting with them](./contract_interaction.md).
\ No newline at end of file
diff --git a/docs/docs/dev_docs/dapps/tutorials/contract_interaction.md b/docs/docs/dev_docs/dapps/tutorials/contract_interaction.md
index ba0febbcfb8..7517ea13e0c 100644
--- a/docs/docs/dev_docs/dapps/tutorials/contract_interaction.md
+++ b/docs/docs/dev_docs/dapps/tutorials/contract_interaction.md
@@ -1,3 +1,135 @@
----
-title: Contract Interactions
----
+# Contract interactions
+
+In this section, we'll write the logic in our app that will interact with the contract we have previously deployed. We'll be using the accounts already seeded in the Sandbox.
+
+## Showing user balance
+
+Let's start by showing our user balance for the private token across their accounts. To do this, we can leverage the `getBalance` [unconstrained](../../contracts/functions.md#unconstrained-functions) view function of the private token contract:
+
+#include_code getBalance yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr rust
+
+:::info
+Note that this function will only return a valid response for accounts registered in the RPC Server, since it requires access to the [user's private state](../../wallets/main.md#private-state). In other words, you cannot query the balance of another user for a private token contract.
+:::
+
+To do this, let's first initialise a new `Contract` instance using `aztec.js` that represents our deployed token contracts. Create a new `src/contracts.mjs` file with the imports for our artifacts and other dependencies:
+
+```js
+// src/contracts.mjs
+import { Contract } from '@aztec/aztec.js';
+import { readFileSync } from 'fs';
+import PrivateTokenArtifact from '../contracts/private_token/target/PrivateToken.json' assert { type: 'json' };
+import PublicTokenArtifact from '../contracts/public_token/target/PublicToken.json' assert { type: 'json' };
+```
+
+And then add the following code for initialising the `Contract` instances:
+
+#include_code get-tokens yarn-project/end-to-end/src/sample-dapp/contracts.mjs javascript
+
+:::info
+You can use the typescript autogenerated interface instead of the generic `Contract` class to get type-safe methods.
+:::
+
+We can now get the private token instance in our main code in `src/index.mjs`, and query the private balance for each of the user accounts. To query a function, without sending a transaction, use the `view` function of the method:
+
+#include_code showPrivateBalances yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+Run this as `node src/index.mjs` and you should now see the following output:
+
+```
+Balance of 0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d: 100
+Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 0
+Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
+```
+
+## Transferring private tokens
+
+Now that we can see the balance for each user, let's transfer tokens from one account to another. To do this, we will first need access to a `Wallet` object. This wraps access to an RPC Server and also provides an interface to craft and sign transactions on behalf of one of the user accounts.
+
+We can initialise a wallet using one of the `getAccount` methods from `aztec.js``, along with the corresponding signing and encryption keys:
+
+```js
+import { getSchnorrAccount } from '@aztec/aztec.js';
+const wallet = await getSchnorrAccount(client, ENCRYPTION_PRIVATE_KEY, SIGNING_PRIVATE_KEY).getWallet();
+```
+
+For ease of use, `aztec.js` also ships with a helper `getSandboxAccountsWallets` method that returns a wallet for each of the pre-initialised accounts in the Sandbox, so you can send transactions as any of them. We'll use one of these wallets to initialise the `Contract` instance that represents our private token contract, so every transaction sent through it will be sent through that wallet.
+
+#include_code transferPrivateFunds yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+Let's go step-by-step on this snippet. We first get wallets for two of the Sandbox accounts, and name them `owner` and `recipient`. Then, we initialise the private token `Contract` instance using the `owner` wallet, meaning that any transactions sent through it will have the `owner` as sender.
+
+Next, we send a transfer transaction, moving 1 unit of balance to the `recipient` account address. This has no immediate effect, since the transaction first needs to be simulated locally and then submitted and mined. Only once this has finished we can query the balances again and see the effect of our transaction. We are using a `showPrivateBalances` helper function here which has the code we wrote in the section above.
+
+Run this new snippet and you should see the following:
+
+```text
+Sent transfer transaction 16025a7c4f6c44611d7ac884a5c27037d85d9756a4924df6d97fb25f6e83a0c8
+
+Balance of 0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d: 100
+Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 0
+Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
+
+Awaiting transaction to be mined
+Transaction has been mined on block 4
+
+Balance of 0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d: 99
+Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 1
+Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
+```
+
+:::info
+At the time of this writing, there are no events emitted when new private notes are received, so the only way to detect of a change in a user's private balance is via polling on every new block processed. This will change in a future release.
+:::
+
+## Working with public state
+
+While they are [fundamentally differently](../../../concepts/foundation/state_model.md), the API for working with private and public functions and state from `aztec.js` is equivalent. To query the balance in public tokens for our user accounts, we can just call the `publicBalanceOf` view function in the contract:
+
+#include_code showPublicBalances yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+:::info
+Since this is a public token contract we are working with, we can now query the balance for any address, not just those registered in our local RPC Server. We can also send funds to addresses for which we don't know their [public encryption key](../../../concepts/foundation/accounts/keys.md#encryption-keys).
+:::
+
+Here, since the public token contract does not mint any initial funds upon deployment, the balances for all of our user's accounts will be zero. But we can send a transaction to mint tokens to change this, using very similar code to the one for sending private funds:
+
+#include_code mintPublicFunds yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+And get the expected results:
+
+```text
+Sent mint transaction 041d5b4cc68bcb5c6cb45cd4c79f893d94f0df0792f66e6fddd7718c049fe925
+Balance of 0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d: 0
+Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 0
+Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
+
+Awaiting transaction to be mined
+Transaction has been mined on block 5
+
+Balance of 0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d: 100
+Balance of 0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972: 0
+Balance of 0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b: 0
+```
+
+Public functions can emit [unencrypted public logs](../../contracts/events.md#unencrypted-events), which we can query via the RPC Server interface. In particular, the public token contract emits a generic `Coins minted` whenever the `mint` method is called:
+
+#include_code unencrypted_log yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr rust
+
+We can extend our code by querying the logs emitted on the last block when the minting transaction is mined:
+
+#include_code showLogs yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+Running the code again would now show an extra line with:
+
+```text
+Log: Coins minted
+```
+
+:::info
+At the time of this writing, there is no event-based mechanism in the `aztec.js` library to subscribe to events. The only option to consume them is to poll on every new block detected. This will change in a future version.
+:::
+
+## Next steps
+
+In the next and final section, we'll [set up automated tests for our application](./testing.md).
\ No newline at end of file
diff --git a/docs/docs/dev_docs/dapps/tutorials/creating_accounts.md b/docs/docs/dev_docs/dapps/tutorials/creating_accounts.md
deleted file mode 100644
index 95e19162829..00000000000
--- a/docs/docs/dev_docs/dapps/tutorials/creating_accounts.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Creating Accounts
----
diff --git a/docs/docs/dev_docs/dapps/tutorials/main.md b/docs/docs/dev_docs/dapps/tutorials/main.md
index 957a8f9c10e..1d576759992 100644
--- a/docs/docs/dev_docs/dapps/tutorials/main.md
+++ b/docs/docs/dev_docs/dapps/tutorials/main.md
@@ -1,10 +1,25 @@
 ---
-title: Dapp Development Tutorials
+title: Dapp Development Tutorial
 ---
 
-Links to specific tutorials
+In this tutorial we'll go through the steps for building a simple application that interacts with the Aztec Sandbox. We'll be building a console application using Javascript and NodeJS, but you may reuse the same concepts here for a web-based app. All Aztec libraries are written in Typescript and fully typed, so you can use Typescript instead of Javascript to make the most out of its type checker.
 
-- Connecting to the RPC Server
-- Creating Accounts
-- Deploying a contract
-- Contract Interactions
+This tutorial will focus on environment setup, including creating accounts and deployments, as well as interacting with your contracts. It will not cover [how to write contracts in Noir](../../contracts/main.md).
+
+The full code for this tutorial is [available on the `aztec-packages` repository](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/end-to-end/src/sample-dapp).
+
+## Dependencies
+
+- Linux or OSX environment
+- [NodeJS](https://nodejs.org/) 18 or higher
+- [Aztec Sandbox](../../getting_started/sandbox.md)
+- [Aztec CLI](../../getting_started/cli.md)
+- [Nargo](../../getting_started/noir_contracts.md) for building contracts
+
+## Prerequisites
+
+Basic understanding of NodeJS and Javascript should be enough to follow this tutorial. Along the way, we'll provide links to dig deeper into Aztec concepts as we introduce them.
+
+## Get started
+
+Let's get started with [setting up a new javascript project](./project_setup.md).
diff --git a/docs/docs/dev_docs/dapps/tutorials/project_setup.md b/docs/docs/dev_docs/dapps/tutorials/project_setup.md
new file mode 100644
index 00000000000..02cb3be2de5
--- /dev/null
+++ b/docs/docs/dev_docs/dapps/tutorials/project_setup.md
@@ -0,0 +1,31 @@
+# Setting up your project
+
+Let's start by setting up a regular Javascript NodeJS project. Feel free to skip this part if you're already familiar with project setup and head directly to connecting to the Sandbox.
+
+## Create a new project
+
+We'll use [`yarn`](https://yarnpkg.com/) for managing our project and dependencies, though you can also use `npm` or your Javascript package manager of choice.
+
+1. Ensure node version is 18 or higher by running.
+
+```sh
+node -v
+```
+
+2. Create a new folder and initialize a new project.
+
+```sh
+mkdir sample-dapp
+cd sample-dapp
+yarn init -yp
+```
+
+3. Add the `aztec.js` library as a dependency:
+
+```sh
+yarn add @aztec/aztec.js
+```
+
+## Next steps
+
+With your project already set up, let's [connect to the Sandbox RPC Server and grab an account to interact with it](./rpc_server.md).
diff --git a/docs/docs/dev_docs/dapps/tutorials/rpc_server.md b/docs/docs/dev_docs/dapps/tutorials/rpc_server.md
index 095f49b49ad..0412ddf5fde 100644
--- a/docs/docs/dev_docs/dapps/tutorials/rpc_server.md
+++ b/docs/docs/dev_docs/dapps/tutorials/rpc_server.md
@@ -1,3 +1,43 @@
----
-title: Connecting to the RPC Server
----
+# Connecting to the RPC Server
+
+As an app developer, the [Aztec RPC Server interface](../api/aztec_rpc.md) provides you with access to the user's accounts and their private state, as well as a connection to the network for accessing public global state.
+
+During the Sandbox phase, this role is fulfilled by the [Aztec Sandbox](../../sandbox/main.md), which runs a local RPC Server and an Aztec Node, both connected to a local Ethereum development node like Anvil. The Sandbox also includes a set of pre-initialised accounts that you can use from your app.
+
+In this section, we'll connect to the Sandbox from our project.
+
+## Create RPC client
+
+We'll use the `createAztecRpcClient` function from `aztec.js` to connect to the Sandbox, which by default runs on `localhost:8080`. To test the connection works, we'll request and print the node's chain id. 
+
+Let's create our first file `src/index.mjs` with the following contents:
+
+#include_code all yarn-project/end-to-end/src/sample-dapp/connect.mjs javascript
+
+Run this example as `node src/index.mjs` and you should see the following output:
+```
+Connected to chain 31337
+```
+
+:::info
+Should the above fail due to a connection error, make sure the Sandbox is running locally and on port 8080.
+:::
+
+## Load user accounts
+
+With our connection to the RPC server, let's try loading the accounts that are pre-initialised in the Sandbox:
+
+#include_code showAccounts yarn-project/end-to-end/src/sample-dapp/index.mjs javascript
+
+Run again the above, and we should see:
+
+```
+User accounts:
+0x0c8a6673d7676cc80aaebe7fa7504cf51daa90ba906861bfad70a58a98bf5a7d
+0x226f8087792beff8d5009eb94e65d2a4a505b70baf4a9f28d33c8d620b0ba972
+0x0e1f60e8566e2c6d32378bdcadb7c63696e853281be798c107266b8c3a88ea9b
+```
+
+## Next steps
+
+With a working connection to the RPC Server, let's now setup our application by [compiling and deploying our contracts](./contract_deployment.md).
\ No newline at end of file
diff --git a/docs/docs/dev_docs/dapps/tutorials/testing.md b/docs/docs/dev_docs/dapps/tutorials/testing.md
new file mode 100644
index 00000000000..c364e27f93b
--- /dev/null
+++ b/docs/docs/dev_docs/dapps/tutorials/testing.md
@@ -0,0 +1,59 @@
+# Testing
+
+To wrap up this tutorial, we'll set up a simple automated test for our dapp contracts. We will be using [jest](https://jestjs.io/), but any nodejs test runner works fine. 
+
+Here we'll only test the happy path for a `transfer` on our private token contract, but in a real application you should be testing both happy and unhappy paths, as well as both your contracts and application logic. Refer to the full [testing guide](../testing.md) for more info on testing and assertions.
+
+## Dependencies
+
+Start by installing our test runner, in this case jest:
+
+```sh
+yarn add -D jest
+```
+
+We'll also be running our Sandbox within the test suite, to avoid polluting a global instance, so we'll need to install the Sandbox itself as a dependency as well:
+
+```sh
+yarn add -D @aztec/aztec-sandbox
+```
+
+## Test setup
+
+Create a new file `src/index.test.mjs` with the imports we'll be using and an empty test suite to begin with:
+
+```js
+import { createSandbox } from '@aztec/aztec-sandbox';
+import { Contract, createAccount } from '@aztec/aztec.js';
+import PrivateTokenArtifact from '../contracts/private_token/target/PrivateToken.json' assert { type: 'json' };
+
+describe('private token', () => {
+
+});
+```
+
+Let's set up our test suite. We'll start [a new Sandbox instance within the test](../testing.md#running-sandbox-in-the-nodejs-process), create two fresh accounts to test with, and deploy an instance of our contract. The `aztec-sandbox` and `aztec.js` provide the helper functions we need to do this:
+
+#include_code setup yarn-project/end-to-end/src/sample-dapp/index.test.mjs javascript
+
+Note that, since we are starting a new Sandbox instance, we need to `stop` it in the test suite teardown. Also, even though the Sandbox runs within our tests, we still need a running Ethereum development node. Make sure you are running [Anvil](https://book.getfoundry.sh/anvil/), [Hardhat Network](https://hardhat.org/hardhat-network/docs/overview), or [Ganache](https://trufflesuite.com/ganache/) along with your tests.
+
+## Writing our test
+
+Now that we have a working test environment, we can write our first test for exercising the `transfer` function on the private token contract. We will use the same `aztec.js` methods we used when building our dapp:
+
+#include_code test yarn-project/end-to-end/src/sample-dapp/index.test.mjs javascript
+
+In this example, we assert that the `recipient`'s balance is increased by the amount transferred. We could also test that the `owner`'s funds are decremented by the same amount, or that a transaction that attempts to send more funds than those available would fail. Check out the [testing guide](../testing.md) for more ideas.
+
+## Running our tests
+
+With a local Ethereum development node running in port 8545, we can run our `jest` tests using `yarn`. The quirky syntax is due to [jest limitations in ESM support](https://jestjs.io/docs/ecmascript-modules), as well as not picking up `mjs` file by default:
+
+```sh
+yarn node --experimental-vm-modules $(yarn bin jest) --testRegex '.*\.test\.mjs$'
+```
+
+## Next steps
+
+Now that you have finished the tutorial, you can dig deeper on the [APIs for dapp development](../api/main.md), learn more about [writing contracts with Noir](../../contracts/main.md), check out the [Sandbox's architecture](../../sandbox/main.md), or read about the [fundamental concepts behind Aztec Network](../../../concepts/foundation/main.md).
\ No newline at end of file
diff --git a/docs/docs/dev_docs/getting_started/noir_contracts.md b/docs/docs/dev_docs/getting_started/noir_contracts.md
index df52447c4d8..e6b9e3a96f8 100644
--- a/docs/docs/dev_docs/getting_started/noir_contracts.md
+++ b/docs/docs/dev_docs/getting_started/noir_contracts.md
@@ -61,7 +61,7 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/noir-aztec" }
+aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/aztec-noir" }
 ```
 
 You are now ready to write your own contracts! 
diff --git a/docs/docs/dev_docs/getting_started/sandbox.md b/docs/docs/dev_docs/getting_started/sandbox.md
index d7000b8624e..8f2dc173a20 100644
--- a/docs/docs/dev_docs/getting_started/sandbox.md
+++ b/docs/docs/dev_docs/getting_started/sandbox.md
@@ -70,7 +70,7 @@ Let's create an empty project called `private-token`. If you are familiar with s
 
 Although both `yarn` and `npm` would work, this example uses `yarn`. Open the terminal and do the following
 
-1. Ensure node version is 18 or more by running
+1. Ensure node version is 18 or higher by running
 
 ```sh
 node -v
diff --git a/docs/docs/dev_docs/wallets/writing_an_account_contract.md b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
index a305e0015c1..b6ddc219c5d 100644
--- a/docs/docs/dev_docs/wallets/writing_an_account_contract.md
+++ b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
@@ -32,7 +32,7 @@ Public Key:  0x0ede151adaef1cfcc1b3e152ea39f00c5cda3f3857cef00decb049d283672dc71
 
 The important part of this contract is the `entrypoint` function, which will be the first function executed in any transaction originated from this account. This function has two main responsibilities: 1) authenticating the transaction and 2) executing calls. It receives a `payload` with the list of function calls to execute, as well as a signature over that payload.
 
-#include_code entrypoint-struct yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-struct yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 :::info
 Using the `EntrypointPayload` struct is not mandatory. You can package the instructions to be carried out by your account contract however you want. However, the entrypoint payload already provides a set of helper functions, both in Noir and Typescript, that can save you a lot of time when writing a new account contract.
@@ -48,7 +48,7 @@ We authenticate the transaction. To do this, we serialise and Pedersen-hash the
 
 Last, we execute the calls in the payload struct. The `execute_calls` helper function runs through the private and public calls included in the entrypoint payload and executes them:
 
-#include_code entrypoint-execute-calls yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-execute-calls yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 Note the usage of the `_with_packed_args` variant of [`call_public_function` and `call_private_function`](../contracts/functions.md#calling-functions). Due to Noir limitations, we cannot include more than a small number of arguments in a function call. However, we can bypass this restriction by using a hash of the arguments in a function call, which gets automatically expanded to the full set of arguments when the nested call is executed. We call this _argument packing_.
 
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 518d6afe2cc..b45e933b025 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -185,10 +185,11 @@ const sidebars = {
             id: "dev_docs/dapps/tutorials/main",
           },
           items: [
+            "dev_docs/dapps/tutorials/project_setup",
             "dev_docs/dapps/tutorials/rpc_server",
-            "dev_docs/dapps/tutorials/creating_accounts",
             "dev_docs/dapps/tutorials/contract_deployment",
             "dev_docs/dapps/tutorials/contract_interaction",
+            "dev_docs/dapps/tutorials/testing",
           ],
         },
       ],
diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json
index 1dd64c67eed..8b0b06821c9 100644
--- a/yarn-project/acir-simulator/package.json
+++ b/yarn-project/acir-simulator/package.json
@@ -26,9 +26,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/acir-simulator/src/public/executor.ts b/yarn-project/acir-simulator/src/public/executor.ts
index bdfd538e490..7c7ce906dd3 100644
--- a/yarn-project/acir-simulator/src/public/executor.ts
+++ b/yarn-project/acir-simulator/src/public/executor.ts
@@ -7,6 +7,7 @@ import {
   FunctionSelector,
   GlobalVariables,
   HistoricBlockData,
+  RETURN_VALUES_LENGTH,
 } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -33,9 +34,6 @@ import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution, PublicExecutionResult } from './execution.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
 
-// Copied from crate::abi at noir-contracts/src/contracts/noir-aztec/src/abi.nr
-const NOIR_MAX_RETURN_VALUES = 4;
-
 /**
  * Handles execution of public functions.
  */
@@ -137,7 +135,7 @@ export class PublicExecutor {
 
         nestedExecutions.push(childExecutionResult);
         this.log(`Returning from nested call: ret=${childExecutionResult.returnValues.join(', ')}`);
-        return padArrayEnd(childExecutionResult.returnValues, Fr.ZERO, NOIR_MAX_RETURN_VALUES).map(toACVMField);
+        return padArrayEnd(childExecutionResult.returnValues, Fr.ZERO, RETURN_VALUES_LENGTH).map(toACVMField);
       },
       emitUnencryptedLog: args => {
         // https://github.com/AztecProtocol/aztec-packages/issues/885
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
index e3168c13f1c..4dbc4a5465e 100644
--- a/yarn-project/archiver/package.json
+++ b/yarn-project/archiver/package.json
@@ -30,9 +30,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
index c9ebdf72c20..ec5beb82863 100644
--- a/yarn-project/aztec-node/package.json
+++ b/yarn-project/aztec-node/package.json
@@ -27,9 +27,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json
index 3f3eefc77de..7ac8adacfc0 100644
--- a/yarn-project/aztec-rpc/package.json
+++ b/yarn-project/aztec-rpc/package.json
@@ -27,9 +27,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/aztec-sandbox/package.json b/yarn-project/aztec-sandbox/package.json
index f565e533ef1..041da41d296 100644
--- a/yarn-project/aztec-sandbox/package.json
+++ b/yarn-project/aztec-sandbox/package.json
@@ -64,9 +64,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "engines": {
diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json
index 956b48c4183..0a67c34d5b3 100644
--- a/yarn-project/aztec.js/package.json
+++ b/yarn-project/aztec.js/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@aztec/aztec.js",
+  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
   "version": "0.1.0",
   "type": "module",
   "exports": {
@@ -32,9 +33,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts b/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
index 0a6dc8b1559..56bc26c9207 100644
--- a/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
+++ b/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
@@ -5,7 +5,7 @@ import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
-// These must match the values defined in yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
+// These must match the values defined in yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
 export const ACCOUNT_MAX_PRIVATE_CALLS = 2;
 export const ACCOUNT_MAX_PUBLIC_CALLS = 2;
 
diff --git a/yarn-project/aztec.js/src/contract/contract.ts b/yarn-project/aztec.js/src/contract/contract.ts
index 5f0c0aff12c..0c58f7d4e5d 100644
--- a/yarn-project/aztec.js/src/contract/contract.ts
+++ b/yarn-project/aztec.js/src/contract/contract.ts
@@ -1,7 +1,9 @@
 import { ContractAbi } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { PublicKey } from '@aztec/types';
 
 import { Wallet } from '../aztec_rpc_client/wallet.js';
+import { DeployMethod, Point } from '../index.js';
 import { ContractBase } from './contract_base.js';
 
 /**
@@ -26,4 +28,25 @@ export class Contract extends ContractBase {
     }
     return new Contract(extendedContractData.getCompleteAddress(), abi, wallet);
   }
+
+  /**
+   * Creates a tx to deploy a new instance of a contract.
+   * @param wallet - The wallet for executing the deployment.
+   * @param abi - ABI of the contract to deploy.
+   * @param args - Arguments for the constructor.
+   */
+  public static deploy(wallet: Wallet, abi: ContractAbi, args: any[]) {
+    return new DeployMethod(Point.ZERO, wallet, abi, args);
+  }
+
+  /**
+   * Creates a tx to deploy a new instance of a contract using the specified public key to derive the address.
+   * @param publicKey - Public key for deriving the address.
+   * @param wallet - The wallet for executing the deployment.
+   * @param abi - ABI of the contract to deploy.
+   * @param args - Arguments for the constructor.
+   */
+  public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, abi: ContractAbi, args: any[]) {
+    return new DeployMethod(publicKey, wallet, abi, args);
+  }
 }
diff --git a/yarn-project/aztec.js/src/sandbox/index.ts b/yarn-project/aztec.js/src/sandbox/index.ts
index 447e29beaaf..2dd17107819 100644
--- a/yarn-project/aztec.js/src/sandbox/index.ts
+++ b/yarn-project/aztec.js/src/sandbox/index.ts
@@ -4,7 +4,7 @@ import { sleep } from '@aztec/foundation/sleep';
 import zip from 'lodash.zip';
 
 import SchnorrAccountContractAbi from '../abis/schnorr_account_contract.json' assert { type: 'json' };
-import { AccountWallet, AztecRPC, getSchnorrAccount } from '../index.js';
+import { AccountWallet, AztecRPC, createAztecRpcClient, getSchnorrAccount } from '../index.js';
 
 export const INITIAL_SANDBOX_ENCRYPTION_KEYS = [
   GrumpkinScalar.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
@@ -18,6 +18,8 @@ export const INITIAL_SANDBOX_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
 
 export const INITIAL_SANDBOX_ACCOUNT_CONTRACT_ABI = SchnorrAccountContractAbi;
 
+export const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
+
 /**
  * Gets a collection of wallets for the Aztec accounts that are initially stored in the sandbox.
  * @param aztecRpc - An instance of the Aztec RPC interface.
@@ -68,12 +70,13 @@ export async function deployInitialSandboxAccounts(aztecRpc: AztecRPC) {
 
 /**
  * Function to wait until the sandbox becomes ready for use.
- * @param rpcServer - The rpc client connected to the sandbox.
+ * @param rpc - The rpc client connected to the sandbox.
  */
-export async function waitForSandbox(rpcServer: AztecRPC) {
+export async function waitForSandbox(rpc?: AztecRPC) {
+  rpc = rpc ?? createAztecRpcClient(SANDBOX_URL);
   while (true) {
     try {
-      await rpcServer.getNodeInfo();
+      await rpc.getNodeInfo();
       break;
     } catch (err) {
       await sleep(1000);
diff --git a/yarn-project/aztec.js/src/utils/account.ts b/yarn-project/aztec.js/src/utils/account.ts
index f82b371d7da..f2a8a21648b 100644
--- a/yarn-project/aztec.js/src/utils/account.ts
+++ b/yarn-project/aztec.js/src/utils/account.ts
@@ -4,6 +4,15 @@ import { AztecRPC } from '@aztec/types';
 import { AccountWallet } from '../aztec_rpc_client/wallet.js';
 import { getSchnorrAccount } from '../index.js';
 
+/**
+ * Deploys and registers a new account using random private keys and returns the associated wallet. Useful for testing.
+ * @param rpc - RPC client.
+ * @returns - A wallet for a fresh account.
+ */
+export function createAccount(rpc: AztecRPC): Promise<AccountWallet> {
+  return getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+}
+
 /**
  * Creates a random address and registers it as a recipient on the RPC server. Useful for testing.
  * @param rpc - RPC client.
diff --git a/yarn-project/aztec.js/src/utils/cheat_codes.ts b/yarn-project/aztec.js/src/utils/cheat_codes.ts
index 6321e0ff135..1dc12106108 100644
--- a/yarn-project/aztec.js/src/utils/cheat_codes.ts
+++ b/yarn-project/aztec.js/src/utils/cheat_codes.ts
@@ -234,7 +234,7 @@ export class AztecCheatCodes {
    */
   public computeSlotInMap(baseSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
     // Based on `at` function in
-    // aztec3-packages/yarn-project/noir-contracts/src/contracts/noir-aztec/src/state_vars/map.nr
+    // aztec3-packages/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
     return Fr.fromBuffer(
       pedersenPlookupCommitInputs(
         this.wasm,
diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json
index 2a3dee75f1b..b2fbac5e846 100644
--- a/yarn-project/circuits.js/package.json
+++ b/yarn-project/circuits.js/package.json
@@ -35,9 +35,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/circuits.js/src/cbind/constants.in.ts b/yarn-project/circuits.js/src/cbind/constants.in.ts
index 09a621cf895..68bf902704b 100644
--- a/yarn-project/circuits.js/src/cbind/constants.in.ts
+++ b/yarn-project/circuits.js/src/cbind/constants.in.ts
@@ -39,7 +39,7 @@ async function main(): Promise<void> {
     processEnumNoir(privateStateNoteGeneratorIndexEnum, 'PRIVATE_STATE_NOTE_GENERATOR_INDEX__') +
     processEnumNoir(privateStateTypeEnum, 'PRIVATE_STATE_TYPE__');
 
-  const noirTargetPath = join(__dirname, '../../../noir-libs/noir-aztec/src/constants_gen.nr');
+  const noirTargetPath = join(__dirname, '../../../noir-libs/aztec-noir/src/constants_gen.nr');
   fs.writeFileSync(noirTargetPath, resultNoir);
 
   // Solidity
diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json
index 845b9296eed..e2541e50de8 100644
--- a/yarn-project/cli/package.json
+++ b/yarn-project/cli/package.json
@@ -30,9 +30,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/end-to-end/.gitignore b/yarn-project/end-to-end/.gitignore
new file mode 100644
index 00000000000..c59c6f13655
--- /dev/null
+++ b/yarn-project/end-to-end/.gitignore
@@ -0,0 +1 @@
+addresses.json
\ No newline at end of file
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
index ffcac42a743..1e7e6a34e01 100644
--- a/yarn-project/end-to-end/package.json
+++ b/yarn-project/end-to-end/package.json
@@ -18,9 +18,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(ts|mjs)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
index 19fdbd27cfc..f8adaec436b 100644
--- a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
+++ b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
@@ -4,11 +4,10 @@ import {
   AztecRPC,
   CheatCodes,
   Fr,
-  GrumpkinScalar,
   L2BlockL2Logs,
+  createAccount,
   createAztecRpcClient,
   getSandboxAccountsWallets,
-  getSchnorrAccount,
   waitForSandbox,
 } from '@aztec/aztec.js';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
@@ -27,8 +26,8 @@ describe('guides/dapp/testing', () => {
         // docs:start:in-proc-sandbox
         ({ rpcServer: rpc, stop } = await createSandbox());
         // docs:end:in-proc-sandbox
-        owner = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
-        recipient = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+        owner = await createAccount(rpc);
+        recipient = await createAccount(rpc);
         token = await PrivateTokenContract.deploy(owner, 100n, owner.getAddress()).send().deployed();
       }, 60_000);
 
@@ -62,8 +61,8 @@ describe('guides/dapp/testing', () => {
 
       beforeEach(async () => {
         rpc = createAztecRpcClient(SANDBOX_URL);
-        owner = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
-        recipient = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+        owner = await createAccount(rpc);
+        recipient = await createAccount(rpc);
         token = await PrivateTokenContract.deploy(owner, 100n, owner.getAddress()).send().deployed();
       }, 30_000);
 
@@ -108,7 +107,7 @@ describe('guides/dapp/testing', () => {
 
       beforeAll(async () => {
         rpc = createAztecRpcClient(SANDBOX_URL);
-        owner = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+        owner = await createAccount(rpc);
         testContract = await TestContract.deploy(owner).send().deployed();
         cheats = await CheatCodes.create(ETHEREUM_HOST, rpc);
       }, 30_000);
@@ -135,8 +134,8 @@ describe('guides/dapp/testing', () => {
 
       beforeAll(async () => {
         rpc = createAztecRpcClient(SANDBOX_URL);
-        owner = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
-        recipient = await getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+        owner = await createAccount(rpc);
+        recipient = await createAccount(rpc);
         token = await PrivateTokenContract.deploy(owner, 100n, owner.getAddress()).send().deployed();
         nativeToken = await NativeTokenContract.deploy(owner, 100n, owner.getAddress()).send().deployed();
 
diff --git a/yarn-project/end-to-end/src/sample-dapp/ci/index.test.mjs b/yarn-project/end-to-end/src/sample-dapp/ci/index.test.mjs
new file mode 100644
index 00000000000..4c3312a6d1d
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/ci/index.test.mjs
@@ -0,0 +1,13 @@
+import { waitForSandbox } from '@aztec/aztec.js';
+
+import { deploy } from '../deploy.mjs';
+import { main } from '../index.mjs';
+
+// Tests on our CI that all scripts included in the guide work fine
+describe('sample-dapp', () => {
+  it('deploys and runs without errors', async () => {
+    await waitForSandbox();
+    await deploy();
+    await main();
+  }, 60_000);
+});
diff --git a/yarn-project/end-to-end/src/sample-dapp/connect.mjs b/yarn-project/end-to-end/src/sample-dapp/connect.mjs
new file mode 100644
index 00000000000..d66fbc3ba02
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/connect.mjs
@@ -0,0 +1,16 @@
+// docs:start:all
+import { createAztecRpcClient } from '@aztec/aztec.js';
+
+const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
+
+async function main() {
+  const client = createAztecRpcClient(SANDBOX_URL);
+  const { chainId } = await client.getNodeInfo();
+  console.log(`Connected to chain ${chainId}`);
+}
+
+main().catch(err => {
+  console.error(`Error in app: ${err}`);
+  process.exit(1);
+});
+// docs:end:all
diff --git a/yarn-project/end-to-end/src/sample-dapp/contracts.mjs b/yarn-project/end-to-end/src/sample-dapp/contracts.mjs
new file mode 100644
index 00000000000..d72e4f4bd5f
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/contracts.mjs
@@ -0,0 +1,19 @@
+import { Contract } from '@aztec/aztec.js';
+import {
+  PrivateTokenContractAbi as PrivateTokenArtifact,
+  PublicTokenContractAbi as PublicTokenArtifact,
+} from '@aztec/noir-contracts/artifacts';
+
+import { readFileSync } from 'fs';
+
+// docs:start:get-tokens
+export async function getPrivateToken(client) {
+  const addresses = JSON.parse(readFileSync('addresses.json'));
+  return Contract.at(addresses.privateToken, PrivateTokenArtifact, client);
+}
+
+export async function getPublicToken(client) {
+  const addresses = JSON.parse(readFileSync('addresses.json'));
+  return Contract.at(addresses.publicToken, PublicTokenArtifact, client);
+}
+// docs:end:get-tokens
diff --git a/yarn-project/end-to-end/src/sample-dapp/deploy.mjs b/yarn-project/end-to-end/src/sample-dapp/deploy.mjs
new file mode 100644
index 00000000000..bcad06487a5
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/deploy.mjs
@@ -0,0 +1,38 @@
+import { ContractDeployer, createAztecRpcClient } from '@aztec/aztec.js';
+import {
+  PrivateTokenContractAbi as PrivateTokenArtifact,
+  PublicTokenContractAbi as PublicTokenArtifact,
+} from '@aztec/noir-contracts/artifacts';
+
+import { writeFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+// docs:start:dapp-deploy
+const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
+
+async function main() {
+  const client = createAztecRpcClient(SANDBOX_URL);
+  const [owner] = await client.getAccounts();
+
+  const privateTokenDeployer = new ContractDeployer(PrivateTokenArtifact, client);
+  const { contractAddress: privateTokenAddress } = await privateTokenDeployer.deploy(100n, owner.address).send().wait();
+  console.log(`Private token deployed at ${privateTokenAddress.toString()}`);
+
+  const publicTokenDeployer = new ContractDeployer(PublicTokenArtifact, client);
+  const { contractAddress: publicTokenAddress } = await publicTokenDeployer.deploy().send().wait();
+  console.log(`Public token deployed at ${publicTokenAddress.toString()}`);
+
+  const addresses = { privateToken: privateTokenAddress.toString(), publicToken: publicTokenAddress.toString() };
+  writeFileSync('addresses.json', JSON.stringify(addresses, null, 2));
+}
+// docs:end:dapp-deploy
+
+// Execute main only if run directly
+if (process.argv[1].replace(/\/index\.m?js$/, '') === fileURLToPath(import.meta.url).replace(/\/index\.m?js$/, '')) {
+  main().catch(err => {
+    console.error(`Error in deployment script: ${err}`);
+    process.exit(1);
+  });
+}
+
+export { main as deploy };
diff --git a/yarn-project/end-to-end/src/sample-dapp/index.mjs b/yarn-project/end-to-end/src/sample-dapp/index.mjs
new file mode 100644
index 00000000000..99bb702ffb3
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/index.mjs
@@ -0,0 +1,103 @@
+import { L2BlockL2Logs, createAztecRpcClient, getSandboxAccountsWallets } from '@aztec/aztec.js';
+import { fileURLToPath } from '@aztec/foundation/url';
+
+import { getPrivateToken, getPublicToken } from './contracts.mjs';
+
+const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
+
+async function showAccounts(client) {
+  // docs:start:showAccounts
+  const accounts = await client.getAccounts();
+  console.log(`User accounts:\n${accounts.map(a => a.address).join('\n')}`);
+  // docs:end:showAccounts
+}
+
+async function showPrivateBalances(client) {
+  // docs:start:showPrivateBalances
+  const accounts = await client.getAccounts();
+  const privateToken = await getPrivateToken(client);
+
+  for (const account of accounts) {
+    // highlight-next-line:showPrivateBalances
+    const balance = await privateToken.methods.getBalance(account.address).view();
+    console.log(`Balance of ${account.address}: ${balance}`);
+  }
+  // docs:end:showPrivateBalances
+}
+
+async function transferPrivateFunds(client) {
+  // docs:start:transferPrivateFunds
+  const [owner, recipient] = await getSandboxAccountsWallets(client);
+  const privateToken = await getPrivateToken(owner);
+
+  const tx = privateToken.methods.transfer(1n, recipient.getAddress()).send();
+  console.log(`Sent transfer transaction ${await tx.getTxHash()}`);
+  await showPrivateBalances(client);
+
+  console.log(`Awaiting transaction to be mined`);
+  const receipt = await tx.wait();
+  console.log(`Transaction has been mined on block ${receipt.blockNumber}`);
+  await showPrivateBalances(client);
+  // docs:end:transferPrivateFunds
+}
+
+async function showPublicBalances(client) {
+  // docs:start:showPublicBalances
+  const accounts = await client.getAccounts();
+  const publicToken = await getPublicToken(client);
+
+  for (const account of accounts) {
+    // highlight-next-line:showPublicBalances
+    const balance = await publicToken.methods.publicBalanceOf(account.address).view();
+    console.log(`Balance of ${account.address}: ${balance}`);
+  }
+  // docs:end:showPublicBalances
+}
+
+async function mintPublicFunds(client) {
+  // docs:start:mintPublicFunds
+  const [owner] = await getSandboxAccountsWallets(client);
+  const publicToken = await getPublicToken(owner);
+
+  const tx = publicToken.methods.mint(100n, owner.getAddress()).send();
+  console.log(`Sent mint transaction ${await tx.getTxHash()}`);
+  await showPublicBalances(client);
+
+  console.log(`Awaiting transaction to be mined`);
+  const receipt = await tx.wait();
+  console.log(`Transaction has been mined on block ${receipt.blockNumber}`);
+  await showPublicBalances(client);
+  // docs:end:mintPublicFunds
+
+  // docs:start:showLogs
+  const blockNumber = await client.getBlockNumber();
+  const logs = await client.getUnencryptedLogs(blockNumber, 1);
+  const textLogs = L2BlockL2Logs.unrollLogs(logs).map(log => log.toString('ascii'));
+  for (const log of textLogs) console.log(`Log emitted: ${log}`);
+  // docs:end:showLogs
+}
+
+async function main() {
+  const client = createAztecRpcClient(SANDBOX_URL);
+  const { chainId } = await client.getNodeInfo();
+  console.log(`Connected to chain ${chainId}`);
+
+  await showAccounts(client);
+
+  await transferPrivateFunds(client);
+
+  await mintPublicFunds(client);
+}
+
+// Execute main only if run directly
+if (process.argv[1].replace(/\/index\.m?js$/, '') === fileURLToPath(import.meta.url).replace(/\/index\.m?js$/, '')) {
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  main()
+    .then(() => process.exit(0))
+    .catch(err => {
+      console.error(`Error in app: ${err}`);
+      process.exit(1);
+    });
+}
+
+export { main };
diff --git a/yarn-project/end-to-end/src/sample-dapp/index.test.mjs b/yarn-project/end-to-end/src/sample-dapp/index.test.mjs
new file mode 100644
index 00000000000..db96a196bf8
--- /dev/null
+++ b/yarn-project/end-to-end/src/sample-dapp/index.test.mjs
@@ -0,0 +1,25 @@
+import { createSandbox } from '@aztec/aztec-sandbox';
+import { Contract, createAccount } from '@aztec/aztec.js';
+import { PrivateTokenContractAbi as PrivateTokenArtifact } from '@aztec/noir-contracts/artifacts';
+
+describe('private token', () => {
+  // docs:start:setup
+  let rpc, stop, owner, recipient, token;
+  beforeAll(async () => {
+    ({ rpcServer: rpc, stop } = await createSandbox());
+    owner = await createAccount(rpc);
+    recipient = await createAccount(rpc);
+    token = await Contract.deploy(owner, PrivateTokenArtifact, [100n, owner.getAddress()]).send().deployed();
+  }, 30_000);
+
+  afterAll(() => stop());
+  // docs:end:setup
+
+  // docs:start:test
+  it('increases recipient funds on transfer', async () => {
+    expect(await token.methods.getBalance(recipient.getAddress()).view()).toEqual(0n);
+    await token.methods.transfer(20n, recipient.getAddress()).send().wait();
+    expect(await token.methods.getBalance(recipient.getAddress()).view()).toEqual(20n);
+  });
+  // docs:end:test
+});
diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json
index 3cf2bd85841..82a2402ad32 100644
--- a/yarn-project/ethereum/package.json
+++ b/yarn-project/ethereum/package.json
@@ -51,9 +51,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "engines": {
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
index d1fdfc2f79f..7441da40186 100644
--- a/yarn-project/foundation/package.json
+++ b/yarn-project/foundation/package.json
@@ -50,9 +50,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json
index f5f191e81fd..e9b76370219 100644
--- a/yarn-project/key-store/package.json
+++ b/yarn-project/key-store/package.json
@@ -26,9 +26,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json
index 2cfa7a4a4bb..163d6fc8dba 100644
--- a/yarn-project/merkle-tree/package.json
+++ b/yarn-project/merkle-tree/package.json
@@ -27,9 +27,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src",
     "testTimeout": 15000
   },
diff --git a/yarn-project/noir-compiler/package.json b/yarn-project/noir-compiler/package.json
index c5d9365430f..067b9a5c6d9 100644
--- a/yarn-project/noir-compiler/package.json
+++ b/yarn-project/noir-compiler/package.json
@@ -32,9 +32,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build
index b946f891009..d82539127fa 100644
--- a/yarn-project/noir-contracts/Dockerfile.build
+++ b/yarn-project/noir-contracts/Dockerfile.build
@@ -21,3 +21,4 @@ ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"
 RUN ./scripts/install_noir.sh
 RUN ./scripts/install_noir_backend.sh
 RUN ./scripts/compile_ci.sh
+RUN ./scripts/nargo_test_ci.sh
diff --git a/yarn-project/noir-contracts/README.md b/yarn-project/noir-contracts/README.md
index 0bc3fd8b345..b4631099f63 100644
--- a/yarn-project/noir-contracts/README.md
+++ b/yarn-project/noir-contracts/README.md
@@ -122,7 +122,7 @@ It has prebuilt binaries and is super easy to install using `noirup`
    compiler_version = "0.7.1"
 
    [dependencies]
-   aztec = { path = "../../../../noir-libs/noir-aztec" }
+   aztec = { path = "../../../../noir-libs/aztec-noir" }
    ```
 
 4. Replace the content of the generated `example_contract/src/main.nr` file with your contract code.
diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json
index fb562f7e291..35b3dc64ebf 100644
--- a/yarn-project/noir-contracts/package.json
+++ b/yarn-project/noir-contracts/package.json
@@ -27,9 +27,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/noir-contracts/scripts/get_all_libraries.sh b/yarn-project/noir-contracts/scripts/get_all_libraries.sh
new file mode 100755
index 00000000000..e1aa684e3fa
--- /dev/null
+++ b/yarn-project/noir-contracts/scripts/get_all_libraries.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# Utility to get the names of all noir libaries located in ../noir-libs
+echo $(ls -d ../noir-libs/*/Nargo.toml | sed -r "s/..\\/noir-libs\\/(.+)\\/Nargo.toml/\\1/")
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/scripts/nargo_test.sh b/yarn-project/noir-contracts/scripts/nargo_test.sh
new file mode 100755
index 00000000000..5c90fef4d20
--- /dev/null
+++ b/yarn-project/noir-contracts/scripts/nargo_test.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Tests noir contracts, if multiple are provided, then they are testing in parallel, bubbling any testing errors
+#
+# Usage:
+# If testing a single contract:
+#   ./scripts/test.sh CONTRACT <CONTRACT_NAME>
+# If testing multiple contracts:
+#   ./scripts/test.sh CONTRACT <CONTRACT_NAME> <CONTRACT_NAME> <CONTRACT_NAME> <CONTRACT_NAME> ...
+# If testing a library:
+#  ./scripts/test.sh LIB <LIBRARY_NAME>
+# If testing multiple libraries:
+#  ./scripts/test.sh LIB <LIBRARY_NAME> <LIBRARY_NAME> <LIBRARY_NAME> <LIBRARY_NAME> ...
+
+ROOT=$(pwd)
+
+# Get the project type from the first argument
+PROJECT_TYPE=$1
+shift
+
+# Error flag file
+error_file="/tmp/error.$$"
+# Array of child PIDs
+pids=()
+
+# Handler for SIGCHLD, cleanup if child exit with error
+handle_sigchld() {
+    for pid in "${pids[@]}"; do
+        # If process is no longer running
+        if ! kill -0 "$pid" 2>/dev/null; then
+            # Wait for the process and get exit status
+            wait "$pid"
+            status=$?
+
+            # If exit status is error
+            if [ $status -ne 0 ]; then
+                # Create error file
+                touch "$error_file"
+            fi
+        fi
+    done
+}
+
+# Set SIGCHLD handler
+trap handle_sigchld SIGCHLD # Trap any ERR signal and call the custom error handler
+
+test() {
+  PROJECT_NAME=$1
+
+  if [ "$PROJECT_TYPE" == "CONTRACT" ]; then
+    CONTRACT_FOLDER="${PROJECT_NAME}_contract"
+    echo "Testing contract $PROJECT_NAME..."
+    cd src/contracts/$CONTRACT_FOLDER
+    nargo test
+  else
+    echo "Testing library $PROJECT_NAME..."
+    cd ../noir-libs/$PROJECT_NAME
+    nargo test
+  fi
+}
+
+echo "Using $(nargo --version)"
+
+# Build contracts
+for PROJECT_NAME in "$@"; do
+  test $PROJECT_NAME  &
+  pids+=($!)
+done
+
+# Wait for all background processes to finish
+wait
+
+# If error file exists, exit with error
+if [ -f "$error_file" ]; then
+    rm "$error_file"
+    echo "Error occurred in one or more child processes. Exiting..."
+    exit 1
+fi
diff --git a/yarn-project/noir-contracts/scripts/nargo_test_ci.sh b/yarn-project/noir-contracts/scripts/nargo_test_ci.sh
new file mode 100755
index 00000000000..103e92c18b8
--- /dev/null
+++ b/yarn-project/noir-contracts/scripts/nargo_test_ci.sh
@@ -0,0 +1,7 @@
+
+#!/bin/bash
+
+# Runs tests scripts for all contracts, then for all libraries.
+
+./scripts/nargo_test.sh CONTRACT $(./scripts/get_all_contracts.sh)
+./scripts/nargo_test.sh LIB $(./scripts/get_all_libraries.sh)
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
index 40f9e3fbffa..58853dc1a57 100644
--- a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
index ee16960f684..013af3ce22e 100644
--- a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
index add81444e03..7826fffbf0d 100644
--- a/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
index b12c667a3a7..4b8208cc51b 100644
--- a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 easy_private_state = { path = "../../../../noir-libs/easy-private-state"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
index fafe0d80e0d..999b75a218a 100644
--- a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
index 1659fd53bd1..4077357a075 100644
--- a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
index 1dfaf41bec9..21840bab59b 100644
--- a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
index 4efdd16534d..8233a8c530c 100644
--- a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 safe_math = { path = "../../../../noir-libs/safe-math" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
index e65ae99c146..86574e53fc1 100644
--- a/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
index dd0dcb29369..42a0a9313a4 100644
--- a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 non_native = { path = "../non_native_token_contract"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
index a114d29bd83..d6c7fef03e1 100644
--- a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
index 5c12622f00f..850b3ad14e5 100644
--- a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
index 052b4bff730..1c0e84969da 100644
--- a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
index 0e36de1f22c..4a8af37b776 100644
--- a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
index 51ff213ea6d..be6246ac397 100644
--- a/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
index b198e85407d..9f21c40d77e 100644
--- a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
index 4bdd80daff0..0eb35564eec 100644
--- a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
@@ -7,6 +7,6 @@ type = "contract"
 
 [dependencies]
 # highlight-next-line:importing-aztec
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 # docs:end:importing-aztec
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr b/yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr
index 8395bbd1ea0..e03c3fa613c 100644
--- a/yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr
+++ b/yarn-project/noir-contracts/src/contracts/private_token_contract/src/main.nr
@@ -1,3 +1,4 @@
+// docs:start:all
 contract PrivateToken {
     use dep::std::option::Option;
     use dep::value_note::{
@@ -109,3 +110,4 @@ contract PrivateToken {
     }
     // docs:end:compute_note_hash_and_nullifier
 }
+// docs:end:all
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
index 3f6be8e4142..04489c04c7e 100644
--- a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr b/yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr
index f32f3ec07bf..2dafe1baff9 100644
--- a/yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr
+++ b/yarn-project/noir-contracts/src/contracts/public_token_contract/src/main.nr
@@ -1,3 +1,4 @@
+// docs:start:all
 contract PublicToken {
     use dep::std::option::Option;
 
@@ -48,8 +49,8 @@ contract PublicToken {
         let storage = Storage::init(Context::public(&mut context));
         let recipient_balance = storage.balances.at(recipient);
         let new_amount = recipient_balance.read() + amount;
-        // docs:start:unencrypted_log
         // TODO: Remove return value.
+        // docs:start:unencrypted_log
         let _hash = emit_unencrypted_log("Coins minted");
         // docs:end:unencrypted_log
         recipient_balance.write(new_amount);
@@ -96,3 +97,4 @@ contract PublicToken {
         storage.balances.at(owner).read()
     }
 }
+// docs:end:all
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
index 1ea6bf3dbe6..84c123fadee 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
index 922b93267d0..77bd89399b3 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
index 4c754d368ef..218d93ac79d 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
index f21b6ca513c..d1eff41f9ae 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
index fd7213c7a9a..1d564c16ddd 100644
--- a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
index d02ae559dd1..21daac464fd 100644
--- a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-libs/noir-aztec/Nargo.toml b/yarn-project/noir-libs/aztec-noir/Nargo.toml
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/Nargo.toml
rename to yarn-project/noir-libs/aztec-noir/Nargo.toml
diff --git a/yarn-project/noir-libs/noir-aztec/src/abi.nr b/yarn-project/noir-libs/aztec-noir/src/abi.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/abi.nr
rename to yarn-project/noir-libs/aztec-noir/src/abi.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/auth.nr b/yarn-project/noir-libs/aztec-noir/src/auth.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/auth.nr
rename to yarn-project/noir-libs/aztec-noir/src/auth.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr b/yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/constants_gen.nr
rename to yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/context.nr b/yarn-project/noir-libs/aztec-noir/src/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr b/yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
rename to yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/lib.nr b/yarn-project/noir-libs/aztec-noir/src/lib.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/lib.nr
rename to yarn-project/noir-libs/aztec-noir/src/lib.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/log.nr b/yarn-project/noir-libs/aztec-noir/src/log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/log.nr
rename to yarn-project/noir-libs/aztec-noir/src/log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging.nr b/yarn-project/noir-libs/aztec-noir/src/messaging.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note.nr b/yarn-project/noir-libs/aztec-noir/src/note.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note.nr
rename to yarn-project/noir-libs/aztec-noir/src/note.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr b/yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_header.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_header.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/utils.nr b/yarn-project/noir-libs/aztec-noir/src/note/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/utils.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle.nr b/yarn-project/noir-libs/aztec-noir/src/oracle.nr
similarity index 78%
rename from yarn-project/noir-libs/noir-aztec/src/oracle.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle.nr
index 838821db45f..056617ed42f 100644
--- a/yarn-project/noir-libs/noir-aztec/src/oracle.nr
+++ b/yarn-project/noir-libs/aztec-noir/src/oracle.nr
@@ -1,3 +1,7 @@
+// docs:start:oracles-module
+/// Oracles module
+// docs:end:oracles-module
+
 mod arguments;
 mod call_private_function;
 mod context;
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/context.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types.nr b/yarn-project/noir-libs/aztec-noir/src/types.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types.nr
rename to yarn-project/noir-libs/aztec-noir/src/types.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/grumpkin_scalar.nr b/yarn-project/noir-libs/aztec-noir/src/types/grumpkin_scalar.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/grumpkin_scalar.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/grumpkin_scalar.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/point.nr b/yarn-project/noir-libs/aztec-noir/src/types/point.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/point.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/point.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/vec.nr b/yarn-project/noir-libs/aztec-noir/src/types/vec.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/vec.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/vec.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/utils.nr b/yarn-project/noir-libs/aztec-noir/src/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/utils.nr
diff --git a/yarn-project/noir-libs/easy-private-state/Nargo.toml b/yarn-project/noir-libs/easy-private-state/Nargo.toml
index 04f0f4266cf..eef8798d8c8 100644
--- a/yarn-project/noir-libs/easy-private-state/Nargo.toml
+++ b/yarn-project/noir-libs/easy-private-state/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
+aztec = { path = "../aztec-noir" }
 value_note = { path = "../value-note" }
\ No newline at end of file
diff --git a/yarn-project/noir-libs/value-note/Nargo.toml b/yarn-project/noir-libs/value-note/Nargo.toml
index e20a368c651..7f527d67f21 100644
--- a/yarn-project/noir-libs/value-note/Nargo.toml
+++ b/yarn-project/noir-libs/value-note/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
\ No newline at end of file
+aztec = { path = "../aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/p2p-bootstrap/package.json b/yarn-project/p2p-bootstrap/package.json
index 41a42011321..89fc049dba2 100644
--- a/yarn-project/p2p-bootstrap/package.json
+++ b/yarn-project/p2p-bootstrap/package.json
@@ -50,9 +50,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "engines": {
diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json
index 98b7276d297..f3213003702 100644
--- a/yarn-project/p2p/package.json
+++ b/yarn-project/p2p/package.json
@@ -28,9 +28,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/package.common.json b/yarn-project/package.common.json
index feaf0fd5764..d6231d92f89 100644
--- a/yarn-project/package.common.json
+++ b/yarn-project/package.common.json
@@ -25,9 +25,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   }
 }
diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json
index 19f2aec28b8..fb946ce8d2b 100644
--- a/yarn-project/prover-client/package.json
+++ b/yarn-project/prover-client/package.json
@@ -26,9 +26,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/rollup-provider/package.json b/yarn-project/rollup-provider/package.json
index 604418c7338..84d68c96dc8 100644
--- a/yarn-project/rollup-provider/package.json
+++ b/yarn-project/rollup-provider/package.json
@@ -28,9 +28,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
index f01cad17e1b..ab89bd8f455 100644
--- a/yarn-project/sequencer-client/package.json
+++ b/yarn-project/sequencer-client/package.json
@@ -28,9 +28,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json
index dd636f1278d..6aaac90d5e8 100644
--- a/yarn-project/types/package.json
+++ b/yarn-project/types/package.json
@@ -26,9 +26,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {
diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json
index 46c1b9df210..36ae514d0ea 100644
--- a/yarn-project/world-state/package.json
+++ b/yarn-project/world-state/package.json
@@ -26,9 +26,9 @@
   "jest": {
     "preset": "ts-jest/presets/default-esm",
     "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
+      "^(\\.{1,2}/.*)\\.m?js$": "$1"
     },
-    "testRegex": "./src/.*\\.test\\.ts$",
+    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src"
   },
   "dependencies": {