diff --git a/Cargo.toml b/Cargo.toml
index f068efd..c259477 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["moat-cli/moat-cli-common", "moat-cli/moat-cli-user", "moat-cli/moat-cli-lp", "moat-cli/moat-cli-sp", "moat-core", "integration-tests", "moat-example"]
+members = ["moat", "moat-cli/moat-cli-common", "moat-cli/moat-cli-user", "moat-cli/moat-cli-lp", "moat-cli/moat-cli-sp", "integration-tests", "moat-example"]
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
index 4fd8cd6..e16dedd 100644
--- a/integration-tests/Cargo.toml
+++ b/integration-tests/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-moat = { path = "../moat-core" }
+moat = { path = "../moat" }
 
 [dev-dependencies]
 dusk-wallet = "0.20.1"
diff --git a/moat-cli/moat-cli-common/Cargo.toml b/moat-cli/moat-cli-common/Cargo.toml
index eab987f..c3f4589 100644
--- a/moat-cli/moat-cli-common/Cargo.toml
+++ b/moat-cli/moat-cli-common/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-moat = { path = "../../moat-core" }
+moat = { path = "../../moat" }
 dusk-plonk = { version = "0.16", default-features = false, features = ["rkyv-impl", "alloc"] }
 dusk-wallet = "0.20.1"
 clap = { version = "4.0", features = ["derive", "env"] }
diff --git a/moat-cli/moat-cli-lp/Cargo.toml b/moat-cli/moat-cli-lp/Cargo.toml
index 9228eb6..188c79f 100644
--- a/moat-cli/moat-cli-lp/Cargo.toml
+++ b/moat-cli/moat-cli-lp/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 dusk-wallet = "0.20.1"
 dusk-jubjub = { version = "0.13", default-features = false }
-moat = { path = "../../moat-core" }
+moat = { path = "../../moat" }
 moat-cli-common = { path = "../moat-cli-common" }
 dusk-pki = "0.13"
 zk-citadel = "0.6.0"
diff --git a/moat-cli/moat-cli-sp/Cargo.toml b/moat-cli/moat-cli-sp/Cargo.toml
index 4852e8d..dc96081 100644
--- a/moat-cli/moat-cli-sp/Cargo.toml
+++ b/moat-cli/moat-cli-sp/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 dusk-wallet = "0.20.1"
-moat = { path = "../../moat-core" }
+moat = { path = "../../moat" }
 moat-cli-common = { path = "../moat-cli-common" }
 zk-citadel = "0.6.0"
 rkyv = { version = "=0.7.39" }
diff --git a/moat-cli/moat-cli-user/Cargo.toml b/moat-cli/moat-cli-user/Cargo.toml
index c3f2198..5805c74 100644
--- a/moat-cli/moat-cli-user/Cargo.toml
+++ b/moat-cli/moat-cli-user/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 dusk-wallet = "0.20.1"
-moat = { path = "../../moat-core" }
+moat = { path = "../../moat" }
 moat-cli-common = { path = "../moat-cli-common" }
 zk-citadel = "0.6.0"
 dusk-plonk = { version = "0.16", default-features = false, features = ["rkyv-impl", "alloc"] }
diff --git a/moat-example/Cargo.toml b/moat-example/Cargo.toml
index 91c20f6..d728304 100644
--- a/moat-example/Cargo.toml
+++ b/moat-example/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 dusk-jubjub = { version = "0.13", default-features = false }
-moat = { path = "../moat-core" }
+moat = { path = "../moat" }
 tokio = { version = "1.21", features = ["full"] }
 rand = "0.8"
diff --git a/moat-core/CHANGELOG.md b/moat/CHANGELOG.md
similarity index 100%
rename from moat-core/CHANGELOG.md
rename to moat/CHANGELOG.md
diff --git a/moat-core/Cargo.toml b/moat/Cargo.toml
similarity index 100%
rename from moat-core/Cargo.toml
rename to moat/Cargo.toml
diff --git a/moat-core/src/api.rs b/moat/src/api.rs
similarity index 100%
rename from moat-core/src/api.rs
rename to moat/src/api.rs
diff --git a/moat-core/src/bc_types.rs b/moat/src/bc_types.rs
similarity index 100%
rename from moat-core/src/bc_types.rs
rename to moat/src/bc_types.rs
diff --git a/moat-core/src/blockchain_payloads/mod.rs b/moat/src/blockchain_payloads/mod.rs
similarity index 100%
rename from moat-core/src/blockchain_payloads/mod.rs
rename to moat/src/blockchain_payloads/mod.rs
diff --git a/moat-core/src/blockchain_payloads/payload_extractor.rs b/moat/src/blockchain_payloads/payload_extractor.rs
similarity index 100%
rename from moat-core/src/blockchain_payloads/payload_extractor.rs
rename to moat/src/blockchain_payloads/payload_extractor.rs
diff --git a/moat-core/src/blockchain_payloads/payload_retriever.rs b/moat/src/blockchain_payloads/payload_retriever.rs
similarity index 100%
rename from moat-core/src/blockchain_payloads/payload_retriever.rs
rename to moat/src/blockchain_payloads/payload_retriever.rs
diff --git a/moat-core/src/blockchain_payloads/payload_sender.rs b/moat/src/blockchain_payloads/payload_sender.rs
similarity index 100%
rename from moat-core/src/blockchain_payloads/payload_sender.rs
rename to moat/src/blockchain_payloads/payload_sender.rs
diff --git a/moat-core/src/blockchain_queries/bc_inquirer.rs b/moat/src/blockchain_queries/bc_inquirer.rs
similarity index 100%
rename from moat-core/src/blockchain_queries/bc_inquirer.rs
rename to moat/src/blockchain_queries/bc_inquirer.rs
diff --git a/moat-core/src/blockchain_queries/crs_getter.rs b/moat/src/blockchain_queries/crs_getter.rs
similarity index 100%
rename from moat-core/src/blockchain_queries/crs_getter.rs
rename to moat/src/blockchain_queries/crs_getter.rs
diff --git a/moat-core/src/blockchain_queries/mod.rs b/moat/src/blockchain_queries/mod.rs
similarity index 100%
rename from moat-core/src/blockchain_queries/mod.rs
rename to moat/src/blockchain_queries/mod.rs
diff --git a/moat-core/src/blockchain_queries/tx_awaiter.rs b/moat/src/blockchain_queries/tx_awaiter.rs
similarity index 100%
rename from moat-core/src/blockchain_queries/tx_awaiter.rs
rename to moat/src/blockchain_queries/tx_awaiter.rs
diff --git a/moat-core/src/blockchain_queries/tx_inquirer.rs b/moat/src/blockchain_queries/tx_inquirer.rs
similarity index 100%
rename from moat-core/src/blockchain_queries/tx_inquirer.rs
rename to moat/src/blockchain_queries/tx_inquirer.rs
diff --git a/moat-core/src/circuit/license_circuit.rs b/moat/src/circuit/license_circuit.rs
similarity index 100%
rename from moat-core/src/circuit/license_circuit.rs
rename to moat/src/circuit/license_circuit.rs
diff --git a/moat-core/src/circuit/mod.rs b/moat/src/circuit/mod.rs
similarity index 100%
rename from moat-core/src/circuit/mod.rs
rename to moat/src/circuit/mod.rs
diff --git a/moat-core/src/citadel_licenses/license_user.rs b/moat/src/citadel_licenses/license_user.rs
similarity index 100%
rename from moat-core/src/citadel_licenses/license_user.rs
rename to moat/src/citadel_licenses/license_user.rs
diff --git a/moat-core/src/citadel_licenses/mod.rs b/moat/src/citadel_licenses/mod.rs
similarity index 100%
rename from moat-core/src/citadel_licenses/mod.rs
rename to moat/src/citadel_licenses/mod.rs
diff --git a/moat-core/src/citadel_queries/citadel_inquirer.rs b/moat/src/citadel_queries/citadel_inquirer.rs
similarity index 100%
rename from moat-core/src/citadel_queries/citadel_inquirer.rs
rename to moat/src/citadel_queries/citadel_inquirer.rs
diff --git a/moat-core/src/citadel_queries/citadel_inquirer_ws.rs b/moat/src/citadel_queries/citadel_inquirer_ws.rs
similarity index 100%
rename from moat-core/src/citadel_queries/citadel_inquirer_ws.rs
rename to moat/src/citadel_queries/citadel_inquirer_ws.rs
diff --git a/moat-core/src/citadel_queries/citadel_types.rs b/moat/src/citadel_queries/citadel_types.rs
similarity index 100%
rename from moat-core/src/citadel_queries/citadel_types.rs
rename to moat/src/citadel_queries/citadel_types.rs
diff --git a/moat-core/src/citadel_queries/mod.rs b/moat/src/citadel_queries/mod.rs
similarity index 100%
rename from moat-core/src/citadel_queries/mod.rs
rename to moat/src/citadel_queries/mod.rs
diff --git a/moat-core/src/citadel_requests/mod.rs b/moat/src/citadel_requests/mod.rs
similarity index 100%
rename from moat-core/src/citadel_requests/mod.rs
rename to moat/src/citadel_requests/mod.rs
diff --git a/moat-core/src/citadel_requests/request_creator.rs b/moat/src/citadel_requests/request_creator.rs
similarity index 100%
rename from moat-core/src/citadel_requests/request_creator.rs
rename to moat/src/citadel_requests/request_creator.rs
diff --git a/moat-core/src/citadel_requests/request_scanner.rs b/moat/src/citadel_requests/request_scanner.rs
similarity index 100%
rename from moat-core/src/citadel_requests/request_scanner.rs
rename to moat/src/citadel_requests/request_scanner.rs
diff --git a/moat-core/src/citadel_requests/request_sender.rs b/moat/src/citadel_requests/request_sender.rs
similarity index 100%
rename from moat-core/src/citadel_requests/request_sender.rs
rename to moat/src/citadel_requests/request_sender.rs
diff --git a/moat-core/src/citadel_types.rs b/moat/src/citadel_types.rs
similarity index 100%
rename from moat-core/src/citadel_types.rs
rename to moat/src/citadel_types.rs
diff --git a/moat-core/src/contract_queries/block.rs b/moat/src/contract_queries/block.rs
similarity index 100%
rename from moat-core/src/contract_queries/block.rs
rename to moat/src/contract_queries/block.rs
diff --git a/moat-core/src/contract_queries/contract_inquirer.rs b/moat/src/contract_queries/contract_inquirer.rs
similarity index 100%
rename from moat-core/src/contract_queries/contract_inquirer.rs
rename to moat/src/contract_queries/contract_inquirer.rs
diff --git a/moat-core/src/contract_queries/contract_inquirer_ws.rs b/moat/src/contract_queries/contract_inquirer_ws.rs
similarity index 100%
rename from moat-core/src/contract_queries/contract_inquirer_ws.rs
rename to moat/src/contract_queries/contract_inquirer_ws.rs
diff --git a/moat-core/src/contract_queries/mod.rs b/moat/src/contract_queries/mod.rs
similarity index 100%
rename from moat-core/src/contract_queries/mod.rs
rename to moat/src/contract_queries/mod.rs
diff --git a/moat-core/src/contract_queries/stream_aux.rs b/moat/src/contract_queries/stream_aux.rs
similarity index 100%
rename from moat-core/src/contract_queries/stream_aux.rs
rename to moat/src/contract_queries/stream_aux.rs
diff --git a/moat-core/src/contract_queries/ws_types.rs b/moat/src/contract_queries/ws_types.rs
similarity index 100%
rename from moat-core/src/contract_queries/ws_types.rs
rename to moat/src/contract_queries/ws_types.rs
diff --git a/moat-core/src/error.rs b/moat/src/error.rs
similarity index 100%
rename from moat-core/src/error.rs
rename to moat/src/error.rs
diff --git a/moat-core/src/json_loader.rs b/moat/src/json_loader.rs
similarity index 100%
rename from moat-core/src/json_loader.rs
rename to moat/src/json_loader.rs
diff --git a/moat-core/src/lib.rs b/moat/src/lib.rs
similarity index 100%
rename from moat-core/src/lib.rs
rename to moat/src/lib.rs
diff --git a/moat-core/src/license_provider/license_issuer.rs b/moat/src/license_provider/license_issuer.rs
similarity index 100%
rename from moat-core/src/license_provider/license_issuer.rs
rename to moat/src/license_provider/license_issuer.rs
diff --git a/moat-core/src/license_provider/mod.rs b/moat/src/license_provider/mod.rs
similarity index 100%
rename from moat-core/src/license_provider/mod.rs
rename to moat/src/license_provider/mod.rs
diff --git a/moat-core/src/license_provider/reference_lp.rs b/moat/src/license_provider/reference_lp.rs
similarity index 100%
rename from moat-core/src/license_provider/reference_lp.rs
rename to moat/src/license_provider/reference_lp.rs
diff --git a/moat-core/src/utils.rs b/moat/src/utils.rs
similarity index 100%
rename from moat-core/src/utils.rs
rename to moat/src/utils.rs
diff --git a/moat-core/src/wallet_accessor/accessor.rs b/moat/src/wallet_accessor/accessor.rs
similarity index 100%
rename from moat-core/src/wallet_accessor/accessor.rs
rename to moat/src/wallet_accessor/accessor.rs
diff --git a/moat-core/src/wallet_accessor/config.rs b/moat/src/wallet_accessor/config.rs
similarity index 100%
rename from moat-core/src/wallet_accessor/config.rs
rename to moat/src/wallet_accessor/config.rs
diff --git a/moat-core/src/wallet_accessor/mod.rs b/moat/src/wallet_accessor/mod.rs
similarity index 100%
rename from moat-core/src/wallet_accessor/mod.rs
rename to moat/src/wallet_accessor/mod.rs
diff --git a/moat-core/tests/extract_request.rs b/moat/tests/extract_request.rs
similarity index 100%
rename from moat-core/tests/extract_request.rs
rename to moat/tests/extract_request.rs
diff --git a/moat-core/tests/scan_transactions.rs b/moat/tests/scan_transactions.rs
similarity index 100%
rename from moat-core/tests/scan_transactions.rs
rename to moat/tests/scan_transactions.rs
diff --git a/moat-core/tests/test_keys/test_keys_lp.json b/moat/tests/test_keys/test_keys_lp.json
similarity index 100%
rename from moat-core/tests/test_keys/test_keys_lp.json
rename to moat/tests/test_keys/test_keys_lp.json
diff --git a/moat-core/tests/test_lp.rs b/moat/tests/test_lp.rs
similarity index 100%
rename from moat-core/tests/test_lp.rs
rename to moat/tests/test_lp.rs
diff --git a/moat-core/tests/tx/transactions.json b/moat/tests/tx/transactions.json
similarity index 100%
rename from moat-core/tests/tx/transactions.json
rename to moat/tests/tx/transactions.json
diff --git a/moat-core/tests/tx/transactions_lp.json b/moat/tests/tx/transactions_lp.json
similarity index 100%
rename from moat-core/tests/tx/transactions_lp.json
rename to moat/tests/tx/transactions_lp.json
diff --git a/moat-core/tests/tx/tx_bad_payload.json b/moat/tests/tx/tx_bad_payload.json
similarity index 100%
rename from moat-core/tests/tx/tx_bad_payload.json
rename to moat/tests/tx/tx_bad_payload.json
diff --git a/moat-core/tests/tx/tx_no_call_data.json b/moat/tests/tx/tx_no_call_data.json
similarity index 100%
rename from moat-core/tests/tx/tx_no_call_data.json
rename to moat/tests/tx/tx_no_call_data.json
diff --git a/moat-core/tests/tx/tx_no_request.json b/moat/tests/tx/tx_no_request.json
similarity index 100%
rename from moat-core/tests/tx/tx_no_request.json
rename to moat/tests/tx/tx_no_request.json
diff --git a/moat-core/tests/tx/tx_with_request.json b/moat/tests/tx/tx_with_request.json
similarity index 100%
rename from moat-core/tests/tx/tx_with_request.json
rename to moat/tests/tx/tx_with_request.json
diff --git a/moat-core/tests/utils.rs b/moat/tests/utils.rs
similarity index 100%
rename from moat-core/tests/utils.rs
rename to moat/tests/utils.rs