From d285be71cff44cb88e64951266c4d68c0d8ae44e Mon Sep 17 00:00:00 2001
From: Artur Michalek <artur.michalek@swmansion.com>
Date: Wed, 8 May 2024 22:24:01 +0200
Subject: [PATCH 1/5] Rename neurons rust to neurons

---
 .../workflows/{neurons-rust-checks.yml => neurons-checks.yml}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{neurons-rust-checks.yml => neurons-checks.yml} (95%)

diff --git a/.github/workflows/neurons-rust-checks.yml b/.github/workflows/neurons-checks.yml
similarity index 95%
rename from .github/workflows/neurons-rust-checks.yml
rename to .github/workflows/neurons-checks.yml
index e73aef9..69f7eb1 100644
--- a/.github/workflows/neurons-rust-checks.yml
+++ b/.github/workflows/neurons-checks.yml
@@ -1,4 +1,4 @@
-name: Neurons Rust Checks
+name: Neurons Checks
 on:
   pull_request:
   push:

From 7577a7986d045642006d4e7c9646df5de0f68b53 Mon Sep 17 00:00:00 2001
From: Artur Michalek <artur.michalek@swmansion.com>
Date: Wed, 8 May 2024 22:24:32 +0200
Subject: [PATCH 2/5] Rename voting to contracts

---
 .github/workflows/{voting-checks.yml => contracts-checks.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{voting-checks.yml => contracts-checks.yml} (96%)

diff --git a/.github/workflows/voting-checks.yml b/.github/workflows/contracts-checks.yml
similarity index 96%
rename from .github/workflows/voting-checks.yml
rename to .github/workflows/contracts-checks.yml
index 403c0c8..e00e4f7 100644
--- a/.github/workflows/voting-checks.yml
+++ b/.github/workflows/contracts-checks.yml
@@ -1,4 +1,4 @@
-name: Voting Contract Checks
+name: Contracts Checks
 on:
   pull_request:
   push:

From 35b059700efb237610cbe933dfbc17e09338f0fa Mon Sep 17 00:00:00 2001
From: Artur Michalek <artur.michalek@swmansion.com>
Date: Wed, 8 May 2024 22:26:11 +0200
Subject: [PATCH 3/5] Rename contract to nqg

---
 contracts/Cargo.lock                          | 20 +++++++++----------
 contracts/Cargo.toml                          |  2 +-
 contracts/{offchain => nqg}/Cargo.toml        |  2 +-
 contracts/{offchain => nqg}/README.md         |  0
 contracts/{offchain => nqg}/mocks/Cargo.toml  |  0
 contracts/{offchain => nqg}/mocks/src/lib.rs  |  0
 contracts/{offchain => nqg}/src/admin.rs      |  0
 .../{offchain => nqg}/src/admin/traits.rs     |  0
 contracts/{offchain => nqg}/src/lib.rs        |  0
 .../src/neural_governance.rs                  |  0
 .../src/neural_governance/traits.rs           |  0
 contracts/{offchain => nqg}/src/storage.rs    |  0
 .../{offchain => nqg}/src/storage/key_data.rs |  0
 contracts/{offchain => nqg}/src/types.rs      |  0
 contracts/{offchain => nqg}/tests/e2e/auth.rs |  0
 .../tests/e2e/common/contract_utils.rs        |  0
 .../{offchain => nqg}/tests/e2e/common/mod.rs |  0
 .../{offchain => nqg}/tests/e2e/governance.rs |  0
 contracts/{offchain => nqg}/tests/e2e/mod.rs  |  0
 .../{offchain => nqg}/tests/e2e/upgrade.rs    |  0
 .../{offchain => nqg}/tests/e2e/voting.rs     |  0
 contracts/{offchain => nqg}/tests/main.rs     |  0
 22 files changed, 12 insertions(+), 12 deletions(-)
 rename contracts/{offchain => nqg}/Cargo.toml (96%)
 rename contracts/{offchain => nqg}/README.md (100%)
 rename contracts/{offchain => nqg}/mocks/Cargo.toml (100%)
 rename contracts/{offchain => nqg}/mocks/src/lib.rs (100%)
 rename contracts/{offchain => nqg}/src/admin.rs (100%)
 rename contracts/{offchain => nqg}/src/admin/traits.rs (100%)
 rename contracts/{offchain => nqg}/src/lib.rs (100%)
 rename contracts/{offchain => nqg}/src/neural_governance.rs (100%)
 rename contracts/{offchain => nqg}/src/neural_governance/traits.rs (100%)
 rename contracts/{offchain => nqg}/src/storage.rs (100%)
 rename contracts/{offchain => nqg}/src/storage/key_data.rs (100%)
 rename contracts/{offchain => nqg}/src/types.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/auth.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/common/contract_utils.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/common/mod.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/governance.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/mod.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/upgrade.rs (100%)
 rename contracts/{offchain => nqg}/tests/e2e/voting.rs (100%)
 rename contracts/{offchain => nqg}/tests/main.rs (100%)

diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index e956bb3..db14683 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -644,6 +644,16 @@ dependencies = [
  "soroban-sdk",
 ]
 
+[[package]]
+name = "nqg"
+version = "0.1.0"
+dependencies = [
+ "mocks",
+ "soroban-fixed-point-math",
+ "soroban-sdk",
+ "soroban_decimal_numbers",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.4"
@@ -700,16 +710,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "offchain"
-version = "0.1.0"
-dependencies = [
- "mocks",
- "soroban-fixed-point-math",
- "soroban-sdk",
- "soroban_decimal_numbers",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
index 263decf..746ef79 100644
--- a/contracts/Cargo.toml
+++ b/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["offchain"]
+members = ["nqg"]
 
 [workspace.dependencies]
 soroban-sdk = "20.4.0"
diff --git a/contracts/offchain/Cargo.toml b/contracts/nqg/Cargo.toml
similarity index 96%
rename from contracts/offchain/Cargo.toml
rename to contracts/nqg/Cargo.toml
index 5b12700..df22341 100644
--- a/contracts/offchain/Cargo.toml
+++ b/contracts/nqg/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "offchain"
+name = "nqg"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/contracts/offchain/README.md b/contracts/nqg/README.md
similarity index 100%
rename from contracts/offchain/README.md
rename to contracts/nqg/README.md
diff --git a/contracts/offchain/mocks/Cargo.toml b/contracts/nqg/mocks/Cargo.toml
similarity index 100%
rename from contracts/offchain/mocks/Cargo.toml
rename to contracts/nqg/mocks/Cargo.toml
diff --git a/contracts/offchain/mocks/src/lib.rs b/contracts/nqg/mocks/src/lib.rs
similarity index 100%
rename from contracts/offchain/mocks/src/lib.rs
rename to contracts/nqg/mocks/src/lib.rs
diff --git a/contracts/offchain/src/admin.rs b/contracts/nqg/src/admin.rs
similarity index 100%
rename from contracts/offchain/src/admin.rs
rename to contracts/nqg/src/admin.rs
diff --git a/contracts/offchain/src/admin/traits.rs b/contracts/nqg/src/admin/traits.rs
similarity index 100%
rename from contracts/offchain/src/admin/traits.rs
rename to contracts/nqg/src/admin/traits.rs
diff --git a/contracts/offchain/src/lib.rs b/contracts/nqg/src/lib.rs
similarity index 100%
rename from contracts/offchain/src/lib.rs
rename to contracts/nqg/src/lib.rs
diff --git a/contracts/offchain/src/neural_governance.rs b/contracts/nqg/src/neural_governance.rs
similarity index 100%
rename from contracts/offchain/src/neural_governance.rs
rename to contracts/nqg/src/neural_governance.rs
diff --git a/contracts/offchain/src/neural_governance/traits.rs b/contracts/nqg/src/neural_governance/traits.rs
similarity index 100%
rename from contracts/offchain/src/neural_governance/traits.rs
rename to contracts/nqg/src/neural_governance/traits.rs
diff --git a/contracts/offchain/src/storage.rs b/contracts/nqg/src/storage.rs
similarity index 100%
rename from contracts/offchain/src/storage.rs
rename to contracts/nqg/src/storage.rs
diff --git a/contracts/offchain/src/storage/key_data.rs b/contracts/nqg/src/storage/key_data.rs
similarity index 100%
rename from contracts/offchain/src/storage/key_data.rs
rename to contracts/nqg/src/storage/key_data.rs
diff --git a/contracts/offchain/src/types.rs b/contracts/nqg/src/types.rs
similarity index 100%
rename from contracts/offchain/src/types.rs
rename to contracts/nqg/src/types.rs
diff --git a/contracts/offchain/tests/e2e/auth.rs b/contracts/nqg/tests/e2e/auth.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/auth.rs
rename to contracts/nqg/tests/e2e/auth.rs
diff --git a/contracts/offchain/tests/e2e/common/contract_utils.rs b/contracts/nqg/tests/e2e/common/contract_utils.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/common/contract_utils.rs
rename to contracts/nqg/tests/e2e/common/contract_utils.rs
diff --git a/contracts/offchain/tests/e2e/common/mod.rs b/contracts/nqg/tests/e2e/common/mod.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/common/mod.rs
rename to contracts/nqg/tests/e2e/common/mod.rs
diff --git a/contracts/offchain/tests/e2e/governance.rs b/contracts/nqg/tests/e2e/governance.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/governance.rs
rename to contracts/nqg/tests/e2e/governance.rs
diff --git a/contracts/offchain/tests/e2e/mod.rs b/contracts/nqg/tests/e2e/mod.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/mod.rs
rename to contracts/nqg/tests/e2e/mod.rs
diff --git a/contracts/offchain/tests/e2e/upgrade.rs b/contracts/nqg/tests/e2e/upgrade.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/upgrade.rs
rename to contracts/nqg/tests/e2e/upgrade.rs
diff --git a/contracts/offchain/tests/e2e/voting.rs b/contracts/nqg/tests/e2e/voting.rs
similarity index 100%
rename from contracts/offchain/tests/e2e/voting.rs
rename to contracts/nqg/tests/e2e/voting.rs
diff --git a/contracts/offchain/tests/main.rs b/contracts/nqg/tests/main.rs
similarity index 100%
rename from contracts/offchain/tests/main.rs
rename to contracts/nqg/tests/main.rs

From 6b2c539c5e4fa8b84adfa463c53c05d19f9fe60f Mon Sep 17 00:00:00 2001
From: Artur Michalek <artur.michalek@swmansion.com>
Date: Wed, 8 May 2024 22:26:35 +0200
Subject: [PATCH 4/5] Add missing image

---
 contracts/nqg/README.md |   2 +-
 contracts/nqg/image.png | Bin 0 -> 12175 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 contracts/nqg/image.png

diff --git a/contracts/nqg/README.md b/contracts/nqg/README.md
index 9b2a665..6be58fb 100644
--- a/contracts/nqg/README.md
+++ b/contracts/nqg/README.md
@@ -3,7 +3,7 @@
 This contract is a part of implementation of
 the [Neural Quorum Governance](https://stellarcommunityfund.gitbook.io/module-library) mechanism.
 
-![architecture](../voting_system/image.png)
+![architecture](image.png)
 
 Currently, because
 of [resource constraints](https://developers.stellar.org/docs/reference/resource-limits-fees#resource-limits) and to
diff --git a/contracts/nqg/image.png b/contracts/nqg/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed1f6ff64215d8f133b1c05a0fc6b6051e82998
GIT binary patch
literal 12175
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
bu`bA6IO*n1dbyumS8hv-D~J_~7{2{q$OiNo

literal 0
HcmV?d00001


From 4271de29a192df6b4ed33a8c8f0ac0114e32033a Mon Sep 17 00:00:00 2001
From: Artur Michalek <artur.michalek@swmansion.com>
Date: Wed, 8 May 2024 22:30:09 +0200
Subject: [PATCH 5/5] Rename contract to governance, remove unused dependency

---
 contracts/Cargo.lock                          |  25 +++++++-----------
 contracts/Cargo.toml                          |   2 +-
 contracts/{nqg => governance}/Cargo.toml      |   3 +--
 contracts/{nqg => governance}/README.md       |   0
 contracts/{nqg => governance}/image.png       | Bin
 .../{nqg => governance}/mocks/Cargo.toml      |   0
 .../{nqg => governance}/mocks/src/lib.rs      |   0
 contracts/{nqg => governance}/src/admin.rs    |   0
 .../{nqg => governance}/src/admin/traits.rs   |   0
 contracts/{nqg => governance}/src/lib.rs      |  10 +++----
 .../src/neural_governance.rs                  |   0
 .../src/neural_governance/traits.rs           |   0
 contracts/{nqg => governance}/src/storage.rs  |   0
 .../src/storage/key_data.rs                   |   0
 contracts/{nqg => governance}/src/types.rs    |   0
 .../{nqg => governance}/tests/e2e/auth.rs     |   0
 .../tests/e2e/common/contract_utils.rs        |  10 +++----
 .../tests/e2e/common/mod.rs                   |   0
 .../tests/e2e/governance.rs                   |   4 +--
 .../{nqg => governance}/tests/e2e/mod.rs      |   0
 .../{nqg => governance}/tests/e2e/upgrade.rs  |   0
 .../{nqg => governance}/tests/e2e/voting.rs   |   4 +--
 contracts/{nqg => governance}/tests/main.rs   |   0
 23 files changed, 25 insertions(+), 33 deletions(-)
 rename contracts/{nqg => governance}/Cargo.toml (89%)
 rename contracts/{nqg => governance}/README.md (100%)
 rename contracts/{nqg => governance}/image.png (100%)
 rename contracts/{nqg => governance}/mocks/Cargo.toml (100%)
 rename contracts/{nqg => governance}/mocks/src/lib.rs (100%)
 rename contracts/{nqg => governance}/src/admin.rs (100%)
 rename contracts/{nqg => governance}/src/admin/traits.rs (100%)
 rename contracts/{nqg => governance}/src/lib.rs (98%)
 rename contracts/{nqg => governance}/src/neural_governance.rs (100%)
 rename contracts/{nqg => governance}/src/neural_governance/traits.rs (100%)
 rename contracts/{nqg => governance}/src/storage.rs (100%)
 rename contracts/{nqg => governance}/src/storage/key_data.rs (100%)
 rename contracts/{nqg => governance}/src/types.rs (100%)
 rename contracts/{nqg => governance}/tests/e2e/auth.rs (100%)
 rename contracts/{nqg => governance}/tests/e2e/common/contract_utils.rs (55%)
 rename contracts/{nqg => governance}/tests/e2e/common/mod.rs (100%)
 rename contracts/{nqg => governance}/tests/e2e/governance.rs (98%)
 rename contracts/{nqg => governance}/tests/e2e/mod.rs (100%)
 rename contracts/{nqg => governance}/tests/e2e/upgrade.rs (100%)
 rename contracts/{nqg => governance}/tests/e2e/voting.rs (98%)
 rename contracts/{nqg => governance}/tests/main.rs (100%)

diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index db14683..a8b68bb 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -453,6 +453,15 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
+[[package]]
+name = "governance"
+version = "0.1.0"
+dependencies = [
+ "mocks",
+ "soroban-fixed-point-math",
+ "soroban-sdk",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -644,16 +653,6 @@ dependencies = [
  "soroban-sdk",
 ]
 
-[[package]]
-name = "nqg"
-version = "0.1.0"
-dependencies = [
- "mocks",
- "soroban-fixed-point-math",
- "soroban-sdk",
- "soroban_decimal_numbers",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.4"
@@ -1143,12 +1142,6 @@ dependencies = [
  "wasmparser-nostd",
 ]
 
-[[package]]
-name = "soroban_decimal_numbers"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f3200c7c9328eb132524f05529b5466ec5044fd193b3913f61cdaf22e0e031a"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
index 746ef79..b245c6b 100644
--- a/contracts/Cargo.toml
+++ b/contracts/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["nqg"]
+members = ["governance"]
 
 [workspace.dependencies]
 soroban-sdk = "20.4.0"
diff --git a/contracts/nqg/Cargo.toml b/contracts/governance/Cargo.toml
similarity index 89%
rename from contracts/nqg/Cargo.toml
rename to contracts/governance/Cargo.toml
index df22341..b1abd1e 100644
--- a/contracts/nqg/Cargo.toml
+++ b/contracts/governance/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "nqg"
+name = "governance"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,7 +8,6 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 soroban-sdk = { workspace = true, features = ["alloc"] }
-soroban_decimal_numbers = "0.1.2"
 soroban-fixed-point-math.workspace = true
 
 [dev_dependencies]
diff --git a/contracts/nqg/README.md b/contracts/governance/README.md
similarity index 100%
rename from contracts/nqg/README.md
rename to contracts/governance/README.md
diff --git a/contracts/nqg/image.png b/contracts/governance/image.png
similarity index 100%
rename from contracts/nqg/image.png
rename to contracts/governance/image.png
diff --git a/contracts/nqg/mocks/Cargo.toml b/contracts/governance/mocks/Cargo.toml
similarity index 100%
rename from contracts/nqg/mocks/Cargo.toml
rename to contracts/governance/mocks/Cargo.toml
diff --git a/contracts/nqg/mocks/src/lib.rs b/contracts/governance/mocks/src/lib.rs
similarity index 100%
rename from contracts/nqg/mocks/src/lib.rs
rename to contracts/governance/mocks/src/lib.rs
diff --git a/contracts/nqg/src/admin.rs b/contracts/governance/src/admin.rs
similarity index 100%
rename from contracts/nqg/src/admin.rs
rename to contracts/governance/src/admin.rs
diff --git a/contracts/nqg/src/admin/traits.rs b/contracts/governance/src/admin/traits.rs
similarity index 100%
rename from contracts/nqg/src/admin/traits.rs
rename to contracts/governance/src/admin/traits.rs
diff --git a/contracts/nqg/src/lib.rs b/contracts/governance/src/lib.rs
similarity index 98%
rename from contracts/nqg/src/lib.rs
rename to contracts/governance/src/lib.rs
index 36d82d9..25108ac 100644
--- a/contracts/nqg/src/lib.rs
+++ b/contracts/governance/src/lib.rs
@@ -34,7 +34,7 @@ pub mod types;
 pub const DECIMALS: i128 = 1_000_000_000_000_000_000;
 
 #[contract]
-pub struct VotingSystemOffchain;
+pub struct VotingSystem;
 
 type ContractResult<T> = Result<T, VotingSystemError>;
 
@@ -66,7 +66,7 @@ pub enum DataKey {
 }
 
 #[contractimpl]
-impl VotingSystemOffchain {
+impl VotingSystem {
     /// Initialize the governance contract.
     pub fn initialize(env: Env, admin: Address, current_round: u32) {
         assert!(!is_set_admin(&env), "Admin already set");
@@ -186,7 +186,7 @@ impl VotingSystemOffchain {
 }
 
 #[contractimpl]
-impl Admin for VotingSystemOffchain {
+impl Admin for VotingSystem {
     fn transfer_admin(env: Env, new_admin: Address) {
         require_admin(&env);
         set_admin(&env, &new_admin);
@@ -200,7 +200,7 @@ impl Admin for VotingSystemOffchain {
 }
 
 #[contractimpl]
-impl Governance for VotingSystemOffchain {
+impl Governance for VotingSystem {
     fn add_layer(
         env: Env,
         raw_neurons: Vec<(String, I256)>,
@@ -332,7 +332,7 @@ impl Governance for VotingSystemOffchain {
         let neural_governance = read_neural_governance(&env).unwrap();
         let mut result: Map<String, I256> = Map::new(&env);
         for layer_id in neural_governance.layers {
-            let layer_result = VotingSystemOffchain::get_layer_result(env.clone(), layer_id)?;
+            let layer_result = VotingSystem::get_layer_result(env.clone(), layer_id)?;
             for (key, value) in layer_result {
                 result.set(
                     key.clone(),
diff --git a/contracts/nqg/src/neural_governance.rs b/contracts/governance/src/neural_governance.rs
similarity index 100%
rename from contracts/nqg/src/neural_governance.rs
rename to contracts/governance/src/neural_governance.rs
diff --git a/contracts/nqg/src/neural_governance/traits.rs b/contracts/governance/src/neural_governance/traits.rs
similarity index 100%
rename from contracts/nqg/src/neural_governance/traits.rs
rename to contracts/governance/src/neural_governance/traits.rs
diff --git a/contracts/nqg/src/storage.rs b/contracts/governance/src/storage.rs
similarity index 100%
rename from contracts/nqg/src/storage.rs
rename to contracts/governance/src/storage.rs
diff --git a/contracts/nqg/src/storage/key_data.rs b/contracts/governance/src/storage/key_data.rs
similarity index 100%
rename from contracts/nqg/src/storage/key_data.rs
rename to contracts/governance/src/storage/key_data.rs
diff --git a/contracts/nqg/src/types.rs b/contracts/governance/src/types.rs
similarity index 100%
rename from contracts/nqg/src/types.rs
rename to contracts/governance/src/types.rs
diff --git a/contracts/nqg/tests/e2e/auth.rs b/contracts/governance/tests/e2e/auth.rs
similarity index 100%
rename from contracts/nqg/tests/e2e/auth.rs
rename to contracts/governance/tests/e2e/auth.rs
diff --git a/contracts/nqg/tests/e2e/common/contract_utils.rs b/contracts/governance/tests/e2e/common/contract_utils.rs
similarity index 55%
rename from contracts/nqg/tests/e2e/common/contract_utils.rs
rename to contracts/governance/tests/e2e/common/contract_utils.rs
index c26a333..c2e0a10 100644
--- a/contracts/nqg/tests/e2e/common/contract_utils.rs
+++ b/contracts/governance/tests/e2e/common/contract_utils.rs
@@ -1,15 +1,15 @@
-use offchain::{VotingSystemOffchain, VotingSystemOffchainClient};
+use governance::{VotingSystem, VotingSystemClient};
 use soroban_sdk::testutils::Address as AddressTrait;
 use soroban_sdk::{Address, Env};
 
-pub fn deploy_contract_without_initialization(env: &Env) -> VotingSystemOffchainClient {
-    let contract_id = env.register_contract(None, VotingSystemOffchain);
-    let contract_client = VotingSystemOffchainClient::new(env, &contract_id);
+pub fn deploy_contract_without_initialization(env: &Env) -> VotingSystemClient {
+    let contract_id = env.register_contract(None, VotingSystem);
+    let contract_client = VotingSystemClient::new(env, &contract_id);
 
     contract_client
 }
 
-pub fn deploy_contract(env: &Env) -> VotingSystemOffchainClient {
+pub fn deploy_contract(env: &Env) -> VotingSystemClient {
     let contract_client = deploy_contract_without_initialization(env);
 
     env.mock_all_auths();
diff --git a/contracts/nqg/tests/e2e/common/mod.rs b/contracts/governance/tests/e2e/common/mod.rs
similarity index 100%
rename from contracts/nqg/tests/e2e/common/mod.rs
rename to contracts/governance/tests/e2e/common/mod.rs
diff --git a/contracts/nqg/tests/e2e/governance.rs b/contracts/governance/tests/e2e/governance.rs
similarity index 98%
rename from contracts/nqg/tests/e2e/governance.rs
rename to contracts/governance/tests/e2e/governance.rs
index d670125..d69cb5e 100644
--- a/contracts/nqg/tests/e2e/governance.rs
+++ b/contracts/governance/tests/e2e/governance.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{vec, Env, String, Vec, I256};
 
-use offchain::types::VotingSystemError;
-use offchain::LayerAggregator;
+use governance::types::VotingSystemError;
+use governance::LayerAggregator;
 
 use crate::e2e::common::contract_utils::deploy_contract;
 
diff --git a/contracts/nqg/tests/e2e/mod.rs b/contracts/governance/tests/e2e/mod.rs
similarity index 100%
rename from contracts/nqg/tests/e2e/mod.rs
rename to contracts/governance/tests/e2e/mod.rs
diff --git a/contracts/nqg/tests/e2e/upgrade.rs b/contracts/governance/tests/e2e/upgrade.rs
similarity index 100%
rename from contracts/nqg/tests/e2e/upgrade.rs
rename to contracts/governance/tests/e2e/upgrade.rs
diff --git a/contracts/nqg/tests/e2e/voting.rs b/contracts/governance/tests/e2e/voting.rs
similarity index 98%
rename from contracts/nqg/tests/e2e/voting.rs
rename to contracts/governance/tests/e2e/voting.rs
index 11c828f..5036b6e 100644
--- a/contracts/nqg/tests/e2e/voting.rs
+++ b/contracts/governance/tests/e2e/voting.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{vec, Env, Map, String, Vec, I256};
 
-use offchain::types::{Vote, VotingSystemError};
-use offchain::{LayerAggregator, DECIMALS};
+use governance::types::{Vote, VotingSystemError};
+use governance::{LayerAggregator, DECIMALS};
 
 use crate::e2e::common::contract_utils::deploy_contract;
 
diff --git a/contracts/nqg/tests/main.rs b/contracts/governance/tests/main.rs
similarity index 100%
rename from contracts/nqg/tests/main.rs
rename to contracts/governance/tests/main.rs