diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 70d51847e..4b5ab7d6c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         package:
-          - core
-          - core-cairo
+          - solidity
+          - cairo
 
     runs-on: ubuntu-latest
     steps:
@@ -21,16 +21,16 @@ jobs:
           node-version: 18.x
           cache: 'yarn'
       - name: Install Foundry
-        if: matrix.package == 'core'
+        if: matrix.package == 'solidity'
         uses: foundry-rs/foundry-toolchain@v1
       - name: Install dependencies
         run: yarn install --network-concurrency 1
       - name: Compile TypeScript
         run: yarn tsc
-        working-directory: packages/${{matrix.package}}
+        working-directory: packages/core/${{matrix.package}}
       - name: Check Svelte
         run: yarn svelte-check
         working-directory: packages/ui
       - name: Run tests
         run: yarn test
-        working-directory: packages/${{matrix.package}}
+        working-directory: packages/core/${{matrix.package}}
diff --git a/README.md b/README.md
index f7a74bcc7..1a012040d 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,7 @@ Contracts Wizard is a web application to interactively build a contract out of c
 
 Install dependencies with `yarn install`.
 
-`packages/core` contains the code generation logic for Solidity.
-
-`packages/core-cairo` contains the code generation logic for Cairo.
+`packages/core` contains the code generation logic for Solidity and Cairo under separately named subfolders.
 
 `packages/ui` is the interface built in Svelte. `yarn dev` spins up a local server to develop the UI.
 
@@ -38,5 +36,5 @@ For Cairo, use the `data-lang` attribute: `<oz-wizard data-lang="cairo"></oz-wiz
 
 The following describes how to use the Contracts Wizard programmatic API in your own applications.
 
-- [Contracts Wizard API for Solidity](packages/core/README.md)
-- [Contracts Wizard API for Cairo](packages/core-cairo/README.md)
+- [Contracts Wizard API for Solidity](packages/core/solidity/README.md)
+- [Contracts Wizard API for Cairo](packages/core/cairo/README.md)
diff --git a/package.json b/package.json
index 18a3f0663..c6c359d09 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
   },
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/core/*",
+      "packages/ui"
     ],
     "nohoist": [
       "**/@types/*",
diff --git a/packages/core-cairo/.gitignore b/packages/core/cairo/.gitignore
similarity index 100%
rename from packages/core-cairo/.gitignore
rename to packages/core/cairo/.gitignore
diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core/cairo/CHANGELOG.md
similarity index 100%
rename from packages/core-cairo/CHANGELOG.md
rename to packages/core/cairo/CHANGELOG.md
diff --git a/packages/core-cairo/LICENSE b/packages/core/cairo/LICENSE
similarity index 100%
rename from packages/core-cairo/LICENSE
rename to packages/core/cairo/LICENSE
diff --git a/packages/core-cairo/NOTICE b/packages/core/cairo/NOTICE
similarity index 100%
rename from packages/core-cairo/NOTICE
rename to packages/core/cairo/NOTICE
diff --git a/packages/core-cairo/README.md b/packages/core/cairo/README.md
similarity index 100%
rename from packages/core-cairo/README.md
rename to packages/core/cairo/README.md
diff --git a/packages/core-cairo/ava.config.js b/packages/core/cairo/ava.config.js
similarity index 100%
rename from packages/core-cairo/ava.config.js
rename to packages/core/cairo/ava.config.js
diff --git a/packages/core-cairo/package.json b/packages/core/cairo/package.json
similarity index 93%
rename from packages/core-cairo/package.json
rename to packages/core/cairo/package.json
index 6cab34438..3e61b4fda 100644
--- a/packages/core-cairo/package.json
+++ b/packages/core/cairo/package.json
@@ -19,7 +19,7 @@
     "prepublish": "rimraf dist *.tsbuildinfo",
     "test": "ava",
     "test:watch": "ava --watch",
-    "version": "node ../../scripts/bump-changelog.js"
+    "version": "node ../../../scripts/bump-changelog.js"
   },
   "devDependencies": {
     "@types/node": "^18.0.0",
diff --git a/packages/core-cairo/src/account.test.ts b/packages/core/cairo/src/account.test.ts
similarity index 100%
rename from packages/core-cairo/src/account.test.ts
rename to packages/core/cairo/src/account.test.ts
diff --git a/packages/core-cairo/src/account.test.ts.md b/packages/core/cairo/src/account.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/account.test.ts.md
rename to packages/core/cairo/src/account.test.ts.md
diff --git a/packages/core-cairo/src/account.test.ts.snap b/packages/core/cairo/src/account.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/account.test.ts.snap
rename to packages/core/cairo/src/account.test.ts.snap
diff --git a/packages/core-cairo/src/account.ts b/packages/core/cairo/src/account.ts
similarity index 100%
rename from packages/core-cairo/src/account.ts
rename to packages/core/cairo/src/account.ts
diff --git a/packages/core-cairo/src/add-pausable.ts b/packages/core/cairo/src/add-pausable.ts
similarity index 100%
rename from packages/core-cairo/src/add-pausable.ts
rename to packages/core/cairo/src/add-pausable.ts
diff --git a/packages/core-cairo/src/api.ts b/packages/core/cairo/src/api.ts
similarity index 100%
rename from packages/core-cairo/src/api.ts
rename to packages/core/cairo/src/api.ts
diff --git a/packages/core-cairo/src/build-generic.ts b/packages/core/cairo/src/build-generic.ts
similarity index 100%
rename from packages/core-cairo/src/build-generic.ts
rename to packages/core/cairo/src/build-generic.ts
diff --git a/packages/core-cairo/src/common-components.ts b/packages/core/cairo/src/common-components.ts
similarity index 100%
rename from packages/core-cairo/src/common-components.ts
rename to packages/core/cairo/src/common-components.ts
diff --git a/packages/core-cairo/src/common-options.ts b/packages/core/cairo/src/common-options.ts
similarity index 100%
rename from packages/core-cairo/src/common-options.ts
rename to packages/core/cairo/src/common-options.ts
diff --git a/packages/core-cairo/src/contract.test.ts b/packages/core/cairo/src/contract.test.ts
similarity index 100%
rename from packages/core-cairo/src/contract.test.ts
rename to packages/core/cairo/src/contract.test.ts
diff --git a/packages/core-cairo/src/contract.test.ts.md b/packages/core/cairo/src/contract.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/contract.test.ts.md
rename to packages/core/cairo/src/contract.test.ts.md
diff --git a/packages/core-cairo/src/contract.test.ts.snap b/packages/core/cairo/src/contract.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/contract.test.ts.snap
rename to packages/core/cairo/src/contract.test.ts.snap
diff --git a/packages/core-cairo/src/contract.ts b/packages/core/cairo/src/contract.ts
similarity index 100%
rename from packages/core-cairo/src/contract.ts
rename to packages/core/cairo/src/contract.ts
diff --git a/packages/core-cairo/src/custom.test.ts b/packages/core/cairo/src/custom.test.ts
similarity index 100%
rename from packages/core-cairo/src/custom.test.ts
rename to packages/core/cairo/src/custom.test.ts
diff --git a/packages/core-cairo/src/custom.test.ts.md b/packages/core/cairo/src/custom.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/custom.test.ts.md
rename to packages/core/cairo/src/custom.test.ts.md
diff --git a/packages/core-cairo/src/custom.test.ts.snap b/packages/core/cairo/src/custom.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/custom.test.ts.snap
rename to packages/core/cairo/src/custom.test.ts.snap
diff --git a/packages/core-cairo/src/custom.ts b/packages/core/cairo/src/custom.ts
similarity index 100%
rename from packages/core-cairo/src/custom.ts
rename to packages/core/cairo/src/custom.ts
diff --git a/packages/core-cairo/src/erc1155.test.ts b/packages/core/cairo/src/erc1155.test.ts
similarity index 100%
rename from packages/core-cairo/src/erc1155.test.ts
rename to packages/core/cairo/src/erc1155.test.ts
diff --git a/packages/core-cairo/src/erc1155.test.ts.md b/packages/core/cairo/src/erc1155.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/erc1155.test.ts.md
rename to packages/core/cairo/src/erc1155.test.ts.md
diff --git a/packages/core-cairo/src/erc1155.test.ts.snap b/packages/core/cairo/src/erc1155.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/erc1155.test.ts.snap
rename to packages/core/cairo/src/erc1155.test.ts.snap
diff --git a/packages/core-cairo/src/erc1155.ts b/packages/core/cairo/src/erc1155.ts
similarity index 100%
rename from packages/core-cairo/src/erc1155.ts
rename to packages/core/cairo/src/erc1155.ts
diff --git a/packages/core-cairo/src/erc20.test.ts b/packages/core/cairo/src/erc20.test.ts
similarity index 100%
rename from packages/core-cairo/src/erc20.test.ts
rename to packages/core/cairo/src/erc20.test.ts
diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core/cairo/src/erc20.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/erc20.test.ts.md
rename to packages/core/cairo/src/erc20.test.ts.md
diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core/cairo/src/erc20.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/erc20.test.ts.snap
rename to packages/core/cairo/src/erc20.test.ts.snap
diff --git a/packages/core-cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
similarity index 100%
rename from packages/core-cairo/src/erc20.ts
rename to packages/core/cairo/src/erc20.ts
diff --git a/packages/core-cairo/src/erc721.test.ts b/packages/core/cairo/src/erc721.test.ts
similarity index 100%
rename from packages/core-cairo/src/erc721.test.ts
rename to packages/core/cairo/src/erc721.test.ts
diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core/cairo/src/erc721.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/erc721.test.ts.md
rename to packages/core/cairo/src/erc721.test.ts.md
diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core/cairo/src/erc721.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/erc721.test.ts.snap
rename to packages/core/cairo/src/erc721.test.ts.snap
diff --git a/packages/core-cairo/src/erc721.ts b/packages/core/cairo/src/erc721.ts
similarity index 100%
rename from packages/core-cairo/src/erc721.ts
rename to packages/core/cairo/src/erc721.ts
diff --git a/packages/core-cairo/src/error.ts b/packages/core/cairo/src/error.ts
similarity index 100%
rename from packages/core-cairo/src/error.ts
rename to packages/core/cairo/src/error.ts
diff --git a/packages/core-cairo/src/external-trait.ts b/packages/core/cairo/src/external-trait.ts
similarity index 100%
rename from packages/core-cairo/src/external-trait.ts
rename to packages/core/cairo/src/external-trait.ts
diff --git a/packages/core-cairo/src/generate/account.ts b/packages/core/cairo/src/generate/account.ts
similarity index 100%
rename from packages/core-cairo/src/generate/account.ts
rename to packages/core/cairo/src/generate/account.ts
diff --git a/packages/core-cairo/src/generate/alternatives.ts b/packages/core/cairo/src/generate/alternatives.ts
similarity index 100%
rename from packages/core-cairo/src/generate/alternatives.ts
rename to packages/core/cairo/src/generate/alternatives.ts
diff --git a/packages/core-cairo/src/generate/custom.ts b/packages/core/cairo/src/generate/custom.ts
similarity index 100%
rename from packages/core-cairo/src/generate/custom.ts
rename to packages/core/cairo/src/generate/custom.ts
diff --git a/packages/core-cairo/src/generate/erc1155.ts b/packages/core/cairo/src/generate/erc1155.ts
similarity index 100%
rename from packages/core-cairo/src/generate/erc1155.ts
rename to packages/core/cairo/src/generate/erc1155.ts
diff --git a/packages/core-cairo/src/generate/erc20.ts b/packages/core/cairo/src/generate/erc20.ts
similarity index 100%
rename from packages/core-cairo/src/generate/erc20.ts
rename to packages/core/cairo/src/generate/erc20.ts
diff --git a/packages/core-cairo/src/generate/erc721.ts b/packages/core/cairo/src/generate/erc721.ts
similarity index 100%
rename from packages/core-cairo/src/generate/erc721.ts
rename to packages/core/cairo/src/generate/erc721.ts
diff --git a/packages/core-cairo/src/generate/governor.ts b/packages/core/cairo/src/generate/governor.ts
similarity index 100%
rename from packages/core-cairo/src/generate/governor.ts
rename to packages/core/cairo/src/generate/governor.ts
diff --git a/packages/core-cairo/src/generate/sources.ts b/packages/core/cairo/src/generate/sources.ts
similarity index 100%
rename from packages/core-cairo/src/generate/sources.ts
rename to packages/core/cairo/src/generate/sources.ts
diff --git a/packages/core-cairo/src/generate/vesting.ts b/packages/core/cairo/src/generate/vesting.ts
similarity index 100%
rename from packages/core-cairo/src/generate/vesting.ts
rename to packages/core/cairo/src/generate/vesting.ts
diff --git a/packages/core-cairo/src/governor.test.ts b/packages/core/cairo/src/governor.test.ts
similarity index 100%
rename from packages/core-cairo/src/governor.test.ts
rename to packages/core/cairo/src/governor.test.ts
diff --git a/packages/core-cairo/src/governor.test.ts.md b/packages/core/cairo/src/governor.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/governor.test.ts.md
rename to packages/core/cairo/src/governor.test.ts.md
diff --git a/packages/core-cairo/src/governor.test.ts.snap b/packages/core/cairo/src/governor.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/governor.test.ts.snap
rename to packages/core/cairo/src/governor.test.ts.snap
diff --git a/packages/core-cairo/src/governor.ts b/packages/core/cairo/src/governor.ts
similarity index 100%
rename from packages/core-cairo/src/governor.ts
rename to packages/core/cairo/src/governor.ts
diff --git a/packages/core-cairo/src/index.ts b/packages/core/cairo/src/index.ts
similarity index 100%
rename from packages/core-cairo/src/index.ts
rename to packages/core/cairo/src/index.ts
diff --git a/packages/core-cairo/src/kind.ts b/packages/core/cairo/src/kind.ts
similarity index 100%
rename from packages/core-cairo/src/kind.ts
rename to packages/core/cairo/src/kind.ts
diff --git a/packages/core-cairo/src/print.ts b/packages/core/cairo/src/print.ts
similarity index 100%
rename from packages/core-cairo/src/print.ts
rename to packages/core/cairo/src/print.ts
diff --git a/packages/core-cairo/src/scripts/update-scarb-project.ts b/packages/core/cairo/src/scripts/update-scarb-project.ts
similarity index 100%
rename from packages/core-cairo/src/scripts/update-scarb-project.ts
rename to packages/core/cairo/src/scripts/update-scarb-project.ts
diff --git a/packages/core-cairo/src/set-access-control.ts b/packages/core/cairo/src/set-access-control.ts
similarity index 100%
rename from packages/core-cairo/src/set-access-control.ts
rename to packages/core/cairo/src/set-access-control.ts
diff --git a/packages/core-cairo/src/set-info.ts b/packages/core/cairo/src/set-info.ts
similarity index 100%
rename from packages/core-cairo/src/set-info.ts
rename to packages/core/cairo/src/set-info.ts
diff --git a/packages/core-cairo/src/set-royalty-info.ts b/packages/core/cairo/src/set-royalty-info.ts
similarity index 100%
rename from packages/core-cairo/src/set-royalty-info.ts
rename to packages/core/cairo/src/set-royalty-info.ts
diff --git a/packages/core-cairo/src/set-upgradeable.ts b/packages/core/cairo/src/set-upgradeable.ts
similarity index 100%
rename from packages/core-cairo/src/set-upgradeable.ts
rename to packages/core/cairo/src/set-upgradeable.ts
diff --git a/packages/core-cairo/src/test.ts b/packages/core/cairo/src/test.ts
similarity index 100%
rename from packages/core-cairo/src/test.ts
rename to packages/core/cairo/src/test.ts
diff --git a/packages/core-cairo/src/utils/convert-strings.test.ts b/packages/core/cairo/src/utils/convert-strings.test.ts
similarity index 100%
rename from packages/core-cairo/src/utils/convert-strings.test.ts
rename to packages/core/cairo/src/utils/convert-strings.test.ts
diff --git a/packages/core-cairo/src/utils/convert-strings.ts b/packages/core/cairo/src/utils/convert-strings.ts
similarity index 100%
rename from packages/core-cairo/src/utils/convert-strings.ts
rename to packages/core/cairo/src/utils/convert-strings.ts
diff --git a/packages/core-cairo/src/utils/define-components.ts b/packages/core/cairo/src/utils/define-components.ts
similarity index 100%
rename from packages/core-cairo/src/utils/define-components.ts
rename to packages/core/cairo/src/utils/define-components.ts
diff --git a/packages/core-cairo/src/utils/define-functions.ts b/packages/core/cairo/src/utils/define-functions.ts
similarity index 100%
rename from packages/core-cairo/src/utils/define-functions.ts
rename to packages/core/cairo/src/utils/define-functions.ts
diff --git a/packages/core-cairo/src/utils/duration.ts b/packages/core/cairo/src/utils/duration.ts
similarity index 100%
rename from packages/core-cairo/src/utils/duration.ts
rename to packages/core/cairo/src/utils/duration.ts
diff --git a/packages/core-cairo/src/utils/find-cover.ts b/packages/core/cairo/src/utils/find-cover.ts
similarity index 100%
rename from packages/core-cairo/src/utils/find-cover.ts
rename to packages/core/cairo/src/utils/find-cover.ts
diff --git a/packages/core-cairo/src/utils/format-lines.ts b/packages/core/cairo/src/utils/format-lines.ts
similarity index 100%
rename from packages/core-cairo/src/utils/format-lines.ts
rename to packages/core/cairo/src/utils/format-lines.ts
diff --git a/packages/core-cairo/src/utils/sorted-by.ts b/packages/core/cairo/src/utils/sorted-by.ts
similarity index 100%
rename from packages/core-cairo/src/utils/sorted-by.ts
rename to packages/core/cairo/src/utils/sorted-by.ts
diff --git a/packages/core-cairo/src/utils/version.test.ts b/packages/core/cairo/src/utils/version.test.ts
similarity index 100%
rename from packages/core-cairo/src/utils/version.test.ts
rename to packages/core/cairo/src/utils/version.test.ts
diff --git a/packages/core-cairo/src/utils/version.ts b/packages/core/cairo/src/utils/version.ts
similarity index 100%
rename from packages/core-cairo/src/utils/version.ts
rename to packages/core/cairo/src/utils/version.ts
diff --git a/packages/core-cairo/src/vesting.test.ts b/packages/core/cairo/src/vesting.test.ts
similarity index 100%
rename from packages/core-cairo/src/vesting.test.ts
rename to packages/core/cairo/src/vesting.test.ts
diff --git a/packages/core-cairo/src/vesting.test.ts.md b/packages/core/cairo/src/vesting.test.ts.md
similarity index 100%
rename from packages/core-cairo/src/vesting.test.ts.md
rename to packages/core/cairo/src/vesting.test.ts.md
diff --git a/packages/core-cairo/src/vesting.test.ts.snap b/packages/core/cairo/src/vesting.test.ts.snap
similarity index 100%
rename from packages/core-cairo/src/vesting.test.ts.snap
rename to packages/core/cairo/src/vesting.test.ts.snap
diff --git a/packages/core-cairo/src/vesting.ts b/packages/core/cairo/src/vesting.ts
similarity index 100%
rename from packages/core-cairo/src/vesting.ts
rename to packages/core/cairo/src/vesting.ts
diff --git a/packages/core-cairo/test_project/.gitignore b/packages/core/cairo/test_project/.gitignore
similarity index 100%
rename from packages/core-cairo/test_project/.gitignore
rename to packages/core/cairo/test_project/.gitignore
diff --git a/packages/core-cairo/test_project/Scarb.lock b/packages/core/cairo/test_project/Scarb.lock
similarity index 100%
rename from packages/core-cairo/test_project/Scarb.lock
rename to packages/core/cairo/test_project/Scarb.lock
diff --git a/packages/core-cairo/test_project/Scarb.toml b/packages/core/cairo/test_project/Scarb.toml
similarity index 100%
rename from packages/core-cairo/test_project/Scarb.toml
rename to packages/core/cairo/test_project/Scarb.toml
diff --git a/packages/core-cairo/tsconfig.json b/packages/core/cairo/tsconfig.json
similarity index 85%
rename from packages/core-cairo/tsconfig.json
rename to packages/core/cairo/tsconfig.json
index f6a21a39d..e51988c6e 100644
--- a/packages/core-cairo/tsconfig.json
+++ b/packages/core/cairo/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "incremental": true,
     "module": "commonjs",
diff --git a/packages/core/.gitignore b/packages/core/solidity/.gitignore
similarity index 100%
rename from packages/core/.gitignore
rename to packages/core/solidity/.gitignore
diff --git a/packages/core/CHANGELOG.md b/packages/core/solidity/CHANGELOG.md
similarity index 100%
rename from packages/core/CHANGELOG.md
rename to packages/core/solidity/CHANGELOG.md
diff --git a/packages/core/LICENSE b/packages/core/solidity/LICENSE
similarity index 100%
rename from packages/core/LICENSE
rename to packages/core/solidity/LICENSE
diff --git a/packages/core/NOTICE b/packages/core/solidity/NOTICE
similarity index 100%
rename from packages/core/NOTICE
rename to packages/core/solidity/NOTICE
diff --git a/packages/core/README.md b/packages/core/solidity/README.md
similarity index 100%
rename from packages/core/README.md
rename to packages/core/solidity/README.md
diff --git a/packages/core/ava.config.js b/packages/core/solidity/ava.config.js
similarity index 100%
rename from packages/core/ava.config.js
rename to packages/core/solidity/ava.config.js
diff --git a/packages/core/contracts/SafetyCheck.sol b/packages/core/solidity/contracts/SafetyCheck.sol
similarity index 100%
rename from packages/core/contracts/SafetyCheck.sol
rename to packages/core/solidity/contracts/SafetyCheck.sol
diff --git a/packages/core/get-imports.d.ts b/packages/core/solidity/get-imports.d.ts
similarity index 100%
rename from packages/core/get-imports.d.ts
rename to packages/core/solidity/get-imports.d.ts
diff --git a/packages/core/get-imports.js b/packages/core/solidity/get-imports.js
similarity index 100%
rename from packages/core/get-imports.js
rename to packages/core/solidity/get-imports.js
diff --git a/packages/core/hardhat.config.js b/packages/core/solidity/hardhat.config.js
similarity index 100%
rename from packages/core/hardhat.config.js
rename to packages/core/solidity/hardhat.config.js
diff --git a/packages/core/openzeppelin-contracts.d.ts b/packages/core/solidity/openzeppelin-contracts.d.ts
similarity index 100%
rename from packages/core/openzeppelin-contracts.d.ts
rename to packages/core/solidity/openzeppelin-contracts.d.ts
diff --git a/packages/core/package.json b/packages/core/solidity/package.json
similarity index 95%
rename from packages/core/package.json
rename to packages/core/solidity/package.json
index 2225e7ae1..c744fc962 100644
--- a/packages/core/package.json
+++ b/packages/core/solidity/package.json
@@ -18,7 +18,7 @@
     "prepublish": "rimraf dist *.tsbuildinfo && hardhat clean",
     "test": "ava",
     "test:watch": "ava --watch",
-    "version": "node ../../scripts/bump-changelog.js",
+    "version": "node ../../../scripts/bump-changelog.js",
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"
   },
   "devDependencies": {
diff --git a/packages/core/print-versioned.js b/packages/core/solidity/print-versioned.js
similarity index 100%
rename from packages/core/print-versioned.js
rename to packages/core/solidity/print-versioned.js
diff --git a/packages/core/print-versioned.ts b/packages/core/solidity/print-versioned.ts
similarity index 100%
rename from packages/core/print-versioned.ts
rename to packages/core/solidity/print-versioned.ts
diff --git a/packages/core/src/add-pausable.ts b/packages/core/solidity/src/add-pausable.ts
similarity index 100%
rename from packages/core/src/add-pausable.ts
rename to packages/core/solidity/src/add-pausable.ts
diff --git a/packages/core/src/api.ts b/packages/core/solidity/src/api.ts
similarity index 100%
rename from packages/core/src/api.ts
rename to packages/core/solidity/src/api.ts
diff --git a/packages/core/src/build-generic.ts b/packages/core/solidity/src/build-generic.ts
similarity index 100%
rename from packages/core/src/build-generic.ts
rename to packages/core/solidity/src/build-generic.ts
diff --git a/packages/core/src/common-functions.ts b/packages/core/solidity/src/common-functions.ts
similarity index 100%
rename from packages/core/src/common-functions.ts
rename to packages/core/solidity/src/common-functions.ts
diff --git a/packages/core/src/common-options.ts b/packages/core/solidity/src/common-options.ts
similarity index 100%
rename from packages/core/src/common-options.ts
rename to packages/core/solidity/src/common-options.ts
diff --git a/packages/core/src/contract.test.ts b/packages/core/solidity/src/contract.test.ts
similarity index 100%
rename from packages/core/src/contract.test.ts
rename to packages/core/solidity/src/contract.test.ts
diff --git a/packages/core/src/contract.test.ts.md b/packages/core/solidity/src/contract.test.ts.md
similarity index 100%
rename from packages/core/src/contract.test.ts.md
rename to packages/core/solidity/src/contract.test.ts.md
diff --git a/packages/core/src/contract.test.ts.snap b/packages/core/solidity/src/contract.test.ts.snap
similarity index 100%
rename from packages/core/src/contract.test.ts.snap
rename to packages/core/solidity/src/contract.test.ts.snap
diff --git a/packages/core/src/contract.ts b/packages/core/solidity/src/contract.ts
similarity index 100%
rename from packages/core/src/contract.ts
rename to packages/core/solidity/src/contract.ts
diff --git a/packages/core/src/custom.test.ts b/packages/core/solidity/src/custom.test.ts
similarity index 100%
rename from packages/core/src/custom.test.ts
rename to packages/core/solidity/src/custom.test.ts
diff --git a/packages/core/src/custom.test.ts.md b/packages/core/solidity/src/custom.test.ts.md
similarity index 100%
rename from packages/core/src/custom.test.ts.md
rename to packages/core/solidity/src/custom.test.ts.md
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/solidity/src/custom.test.ts.snap
similarity index 100%
rename from packages/core/src/custom.test.ts.snap
rename to packages/core/solidity/src/custom.test.ts.snap
diff --git a/packages/core/src/custom.ts b/packages/core/solidity/src/custom.ts
similarity index 100%
rename from packages/core/src/custom.ts
rename to packages/core/solidity/src/custom.ts
diff --git a/packages/core/src/environments/hardhat/package-lock.json b/packages/core/solidity/src/environments/hardhat/package-lock.json
similarity index 100%
rename from packages/core/src/environments/hardhat/package-lock.json
rename to packages/core/solidity/src/environments/hardhat/package-lock.json
diff --git a/packages/core/src/environments/hardhat/package.json b/packages/core/solidity/src/environments/hardhat/package.json
similarity index 100%
rename from packages/core/src/environments/hardhat/package.json
rename to packages/core/solidity/src/environments/hardhat/package.json
diff --git a/packages/core/src/environments/hardhat/upgradeable/package-lock.json b/packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json
similarity index 100%
rename from packages/core/src/environments/hardhat/upgradeable/package-lock.json
rename to packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json
diff --git a/packages/core/src/environments/hardhat/upgradeable/package.json b/packages/core/solidity/src/environments/hardhat/upgradeable/package.json
similarity index 100%
rename from packages/core/src/environments/hardhat/upgradeable/package.json
rename to packages/core/solidity/src/environments/hardhat/upgradeable/package.json
diff --git a/packages/core/src/erc1155.test.ts b/packages/core/solidity/src/erc1155.test.ts
similarity index 100%
rename from packages/core/src/erc1155.test.ts
rename to packages/core/solidity/src/erc1155.test.ts
diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/solidity/src/erc1155.test.ts.md
similarity index 100%
rename from packages/core/src/erc1155.test.ts.md
rename to packages/core/solidity/src/erc1155.test.ts.md
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/solidity/src/erc1155.test.ts.snap
similarity index 100%
rename from packages/core/src/erc1155.test.ts.snap
rename to packages/core/solidity/src/erc1155.test.ts.snap
diff --git a/packages/core/src/erc1155.ts b/packages/core/solidity/src/erc1155.ts
similarity index 100%
rename from packages/core/src/erc1155.ts
rename to packages/core/solidity/src/erc1155.ts
diff --git a/packages/core/src/erc20.test.ts b/packages/core/solidity/src/erc20.test.ts
similarity index 100%
rename from packages/core/src/erc20.test.ts
rename to packages/core/solidity/src/erc20.test.ts
diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/solidity/src/erc20.test.ts.md
similarity index 100%
rename from packages/core/src/erc20.test.ts.md
rename to packages/core/solidity/src/erc20.test.ts.md
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/solidity/src/erc20.test.ts.snap
similarity index 100%
rename from packages/core/src/erc20.test.ts.snap
rename to packages/core/solidity/src/erc20.test.ts.snap
diff --git a/packages/core/src/erc20.ts b/packages/core/solidity/src/erc20.ts
similarity index 100%
rename from packages/core/src/erc20.ts
rename to packages/core/solidity/src/erc20.ts
diff --git a/packages/core/src/erc721.test.ts b/packages/core/solidity/src/erc721.test.ts
similarity index 100%
rename from packages/core/src/erc721.test.ts
rename to packages/core/solidity/src/erc721.test.ts
diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/solidity/src/erc721.test.ts.md
similarity index 100%
rename from packages/core/src/erc721.test.ts.md
rename to packages/core/solidity/src/erc721.test.ts.md
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/solidity/src/erc721.test.ts.snap
similarity index 100%
rename from packages/core/src/erc721.test.ts.snap
rename to packages/core/solidity/src/erc721.test.ts.snap
diff --git a/packages/core/src/erc721.ts b/packages/core/solidity/src/erc721.ts
similarity index 100%
rename from packages/core/src/erc721.ts
rename to packages/core/solidity/src/erc721.ts
diff --git a/packages/core/src/error.ts b/packages/core/solidity/src/error.ts
similarity index 100%
rename from packages/core/src/error.ts
rename to packages/core/solidity/src/error.ts
diff --git a/packages/core/src/generate/alternatives.ts b/packages/core/solidity/src/generate/alternatives.ts
similarity index 100%
rename from packages/core/src/generate/alternatives.ts
rename to packages/core/solidity/src/generate/alternatives.ts
diff --git a/packages/core/src/generate/custom.ts b/packages/core/solidity/src/generate/custom.ts
similarity index 100%
rename from packages/core/src/generate/custom.ts
rename to packages/core/solidity/src/generate/custom.ts
diff --git a/packages/core/src/generate/erc1155.ts b/packages/core/solidity/src/generate/erc1155.ts
similarity index 100%
rename from packages/core/src/generate/erc1155.ts
rename to packages/core/solidity/src/generate/erc1155.ts
diff --git a/packages/core/src/generate/erc20.ts b/packages/core/solidity/src/generate/erc20.ts
similarity index 100%
rename from packages/core/src/generate/erc20.ts
rename to packages/core/solidity/src/generate/erc20.ts
diff --git a/packages/core/src/generate/erc721.ts b/packages/core/solidity/src/generate/erc721.ts
similarity index 100%
rename from packages/core/src/generate/erc721.ts
rename to packages/core/solidity/src/generate/erc721.ts
diff --git a/packages/core/src/generate/governor.ts b/packages/core/solidity/src/generate/governor.ts
similarity index 100%
rename from packages/core/src/generate/governor.ts
rename to packages/core/solidity/src/generate/governor.ts
diff --git a/packages/core/src/generate/sources.ts b/packages/core/solidity/src/generate/sources.ts
similarity index 100%
rename from packages/core/src/generate/sources.ts
rename to packages/core/solidity/src/generate/sources.ts
diff --git a/packages/core/src/generate/stablecoin.ts b/packages/core/solidity/src/generate/stablecoin.ts
similarity index 100%
rename from packages/core/src/generate/stablecoin.ts
rename to packages/core/solidity/src/generate/stablecoin.ts
diff --git a/packages/core/src/get-imports.test.ts b/packages/core/solidity/src/get-imports.test.ts
similarity index 100%
rename from packages/core/src/get-imports.test.ts
rename to packages/core/solidity/src/get-imports.test.ts
diff --git a/packages/core/src/get-imports.ts b/packages/core/solidity/src/get-imports.ts
similarity index 100%
rename from packages/core/src/get-imports.ts
rename to packages/core/solidity/src/get-imports.ts
diff --git a/packages/core/src/governor.test.ts b/packages/core/solidity/src/governor.test.ts
similarity index 100%
rename from packages/core/src/governor.test.ts
rename to packages/core/solidity/src/governor.test.ts
diff --git a/packages/core/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md
similarity index 100%
rename from packages/core/src/governor.test.ts.md
rename to packages/core/solidity/src/governor.test.ts.md
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
similarity index 100%
rename from packages/core/src/governor.test.ts.snap
rename to packages/core/solidity/src/governor.test.ts.snap
diff --git a/packages/core/src/governor.ts b/packages/core/solidity/src/governor.ts
similarity index 100%
rename from packages/core/src/governor.ts
rename to packages/core/solidity/src/governor.ts
diff --git a/packages/core/src/index.ts b/packages/core/solidity/src/index.ts
similarity index 100%
rename from packages/core/src/index.ts
rename to packages/core/solidity/src/index.ts
diff --git a/packages/core/src/infer-transpiled.test.ts b/packages/core/solidity/src/infer-transpiled.test.ts
similarity index 100%
rename from packages/core/src/infer-transpiled.test.ts
rename to packages/core/solidity/src/infer-transpiled.test.ts
diff --git a/packages/core/src/infer-transpiled.ts b/packages/core/solidity/src/infer-transpiled.ts
similarity index 100%
rename from packages/core/src/infer-transpiled.ts
rename to packages/core/solidity/src/infer-transpiled.ts
diff --git a/packages/core/src/kind.ts b/packages/core/solidity/src/kind.ts
similarity index 100%
rename from packages/core/src/kind.ts
rename to packages/core/solidity/src/kind.ts
diff --git a/packages/core/src/options.ts b/packages/core/solidity/src/options.ts
similarity index 100%
rename from packages/core/src/options.ts
rename to packages/core/solidity/src/options.ts
diff --git a/packages/core/src/print-versioned.ts b/packages/core/solidity/src/print-versioned.ts
similarity index 100%
rename from packages/core/src/print-versioned.ts
rename to packages/core/solidity/src/print-versioned.ts
diff --git a/packages/core/src/print.ts b/packages/core/solidity/src/print.ts
similarity index 100%
rename from packages/core/src/print.ts
rename to packages/core/solidity/src/print.ts
diff --git a/packages/core/src/scripts/prepare.ts b/packages/core/solidity/src/scripts/prepare.ts
similarity index 100%
rename from packages/core/src/scripts/prepare.ts
rename to packages/core/solidity/src/scripts/prepare.ts
diff --git a/packages/core/src/set-access-control.ts b/packages/core/solidity/src/set-access-control.ts
similarity index 100%
rename from packages/core/src/set-access-control.ts
rename to packages/core/solidity/src/set-access-control.ts
diff --git a/packages/core/src/set-clock-mode.ts b/packages/core/solidity/src/set-clock-mode.ts
similarity index 100%
rename from packages/core/src/set-clock-mode.ts
rename to packages/core/solidity/src/set-clock-mode.ts
diff --git a/packages/core/src/set-info.ts b/packages/core/solidity/src/set-info.ts
similarity index 100%
rename from packages/core/src/set-info.ts
rename to packages/core/solidity/src/set-info.ts
diff --git a/packages/core/src/set-upgradeable.ts b/packages/core/solidity/src/set-upgradeable.ts
similarity index 100%
rename from packages/core/src/set-upgradeable.ts
rename to packages/core/solidity/src/set-upgradeable.ts
diff --git a/packages/core/src/solidity-version.json b/packages/core/solidity/src/solidity-version.json
similarity index 100%
rename from packages/core/src/solidity-version.json
rename to packages/core/solidity/src/solidity-version.json
diff --git a/packages/core/src/stablecoin.test.ts b/packages/core/solidity/src/stablecoin.test.ts
similarity index 100%
rename from packages/core/src/stablecoin.test.ts
rename to packages/core/solidity/src/stablecoin.test.ts
diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/solidity/src/stablecoin.test.ts.md
similarity index 100%
rename from packages/core/src/stablecoin.test.ts.md
rename to packages/core/solidity/src/stablecoin.test.ts.md
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/solidity/src/stablecoin.test.ts.snap
similarity index 100%
rename from packages/core/src/stablecoin.test.ts.snap
rename to packages/core/solidity/src/stablecoin.test.ts.snap
diff --git a/packages/core/src/stablecoin.ts b/packages/core/solidity/src/stablecoin.ts
similarity index 100%
rename from packages/core/src/stablecoin.ts
rename to packages/core/solidity/src/stablecoin.ts
diff --git a/packages/core/src/test.ts b/packages/core/solidity/src/test.ts
similarity index 100%
rename from packages/core/src/test.ts
rename to packages/core/solidity/src/test.ts
diff --git a/packages/core/src/utils/define-functions.ts b/packages/core/solidity/src/utils/define-functions.ts
similarity index 100%
rename from packages/core/src/utils/define-functions.ts
rename to packages/core/solidity/src/utils/define-functions.ts
diff --git a/packages/core/src/utils/duration.ts b/packages/core/solidity/src/utils/duration.ts
similarity index 100%
rename from packages/core/src/utils/duration.ts
rename to packages/core/solidity/src/utils/duration.ts
diff --git a/packages/core/src/utils/find-cover.ts b/packages/core/solidity/src/utils/find-cover.ts
similarity index 100%
rename from packages/core/src/utils/find-cover.ts
rename to packages/core/solidity/src/utils/find-cover.ts
diff --git a/packages/core/src/utils/format-lines.ts b/packages/core/solidity/src/utils/format-lines.ts
similarity index 100%
rename from packages/core/src/utils/format-lines.ts
rename to packages/core/solidity/src/utils/format-lines.ts
diff --git a/packages/core/src/utils/map-values.ts b/packages/core/solidity/src/utils/map-values.ts
similarity index 100%
rename from packages/core/src/utils/map-values.ts
rename to packages/core/solidity/src/utils/map-values.ts
diff --git a/packages/core/src/utils/sorted-by.ts b/packages/core/solidity/src/utils/sorted-by.ts
similarity index 100%
rename from packages/core/src/utils/sorted-by.ts
rename to packages/core/solidity/src/utils/sorted-by.ts
diff --git a/packages/core/src/utils/to-identifier.test.ts b/packages/core/solidity/src/utils/to-identifier.test.ts
similarity index 100%
rename from packages/core/src/utils/to-identifier.test.ts
rename to packages/core/solidity/src/utils/to-identifier.test.ts
diff --git a/packages/core/src/utils/to-identifier.ts b/packages/core/solidity/src/utils/to-identifier.ts
similarity index 100%
rename from packages/core/src/utils/to-identifier.ts
rename to packages/core/solidity/src/utils/to-identifier.ts
diff --git a/packages/core/src/utils/transitive-closure.ts b/packages/core/solidity/src/utils/transitive-closure.ts
similarity index 100%
rename from packages/core/src/utils/transitive-closure.ts
rename to packages/core/solidity/src/utils/transitive-closure.ts
diff --git a/packages/core/src/utils/version.test.ts b/packages/core/solidity/src/utils/version.test.ts
similarity index 100%
rename from packages/core/src/utils/version.test.ts
rename to packages/core/solidity/src/utils/version.test.ts
diff --git a/packages/core/src/utils/version.ts b/packages/core/solidity/src/utils/version.ts
similarity index 100%
rename from packages/core/src/utils/version.ts
rename to packages/core/solidity/src/utils/version.ts
diff --git a/packages/core/src/zip-foundry.test.ts b/packages/core/solidity/src/zip-foundry.test.ts
similarity index 100%
rename from packages/core/src/zip-foundry.test.ts
rename to packages/core/solidity/src/zip-foundry.test.ts
diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/solidity/src/zip-foundry.test.ts.md
similarity index 100%
rename from packages/core/src/zip-foundry.test.ts.md
rename to packages/core/solidity/src/zip-foundry.test.ts.md
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/solidity/src/zip-foundry.test.ts.snap
similarity index 100%
rename from packages/core/src/zip-foundry.test.ts.snap
rename to packages/core/solidity/src/zip-foundry.test.ts.snap
diff --git a/packages/core/src/zip-foundry.ts b/packages/core/solidity/src/zip-foundry.ts
similarity index 100%
rename from packages/core/src/zip-foundry.ts
rename to packages/core/solidity/src/zip-foundry.ts
diff --git a/packages/core/src/zip-hardhat.test.ts b/packages/core/solidity/src/zip-hardhat.test.ts
similarity index 100%
rename from packages/core/src/zip-hardhat.test.ts
rename to packages/core/solidity/src/zip-hardhat.test.ts
diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/solidity/src/zip-hardhat.test.ts.md
similarity index 100%
rename from packages/core/src/zip-hardhat.test.ts.md
rename to packages/core/solidity/src/zip-hardhat.test.ts.md
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/solidity/src/zip-hardhat.test.ts.snap
similarity index 100%
rename from packages/core/src/zip-hardhat.test.ts.snap
rename to packages/core/solidity/src/zip-hardhat.test.ts.snap
diff --git a/packages/core/src/zip-hardhat.ts b/packages/core/solidity/src/zip-hardhat.ts
similarity index 100%
rename from packages/core/src/zip-hardhat.ts
rename to packages/core/solidity/src/zip-hardhat.ts
diff --git a/packages/core/tsconfig.json b/packages/core/solidity/tsconfig.json
similarity index 85%
rename from packages/core/tsconfig.json
rename to packages/core/solidity/tsconfig.json
index f6a21a39d..e51988c6e 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/solidity/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "incremental": true,
     "module": "commonjs",
diff --git a/packages/core/zip-env-foundry.js b/packages/core/solidity/zip-env-foundry.js
similarity index 100%
rename from packages/core/zip-env-foundry.js
rename to packages/core/solidity/zip-env-foundry.js
diff --git a/packages/core/zip-env-foundry.ts b/packages/core/solidity/zip-env-foundry.ts
similarity index 100%
rename from packages/core/zip-env-foundry.ts
rename to packages/core/solidity/zip-env-foundry.ts
diff --git a/packages/core/zip-env-hardhat.js b/packages/core/solidity/zip-env-hardhat.js
similarity index 100%
rename from packages/core/zip-env-hardhat.js
rename to packages/core/solidity/zip-env-hardhat.js
diff --git a/packages/core/zip-env-hardhat.ts b/packages/core/solidity/zip-env-hardhat.ts
similarity index 100%
rename from packages/core/zip-env-hardhat.ts
rename to packages/core/solidity/zip-env-hardhat.ts
diff --git a/packages/ui/api/ai.ts b/packages/ui/api/ai.ts
index b203e4209..90fff1255 100644
--- a/packages/ui/api/ai.ts
+++ b/packages/ui/api/ai.ts
@@ -1,6 +1,6 @@
 import OpenAI from 'https://esm.sh/openai@4.11.0'
 import { OpenAIStream, StreamingTextResponse } from 'https://esm.sh/ai@2.2.16'
-import { erc20Function, erc721Function, erc1155Function, stablecoinFunction, realWorldAssetFunction, governorFunction, customFunction } from '../src/wiz-functions.ts'
+import { erc20Function, erc721Function, erc1155Function, stablecoinFunction, realWorldAssetFunction, governorFunction, customFunction } from '../src/solidity/wiz-functions.ts'
 import { Redis } from 'https://esm.sh/@upstash/redis@1.25.1'
 
 export default async (req: Request) => {
diff --git a/packages/ui/rollup.config.mjs b/packages/ui/rollup.config.mjs
index 2ba764434..76077d7e9 100644
--- a/packages/ui/rollup.config.mjs
+++ b/packages/ui/rollup.config.mjs
@@ -97,7 +97,7 @@ export default [
     },
     plugins: [
       // Generate openzeppelin-contracts.js data file
-      onStartRun(...'yarn --cwd ../core prepare'.split(' ')),
+      onStartRun(...'yarn --cwd ../core/solidity prepare'.split(' ')),
 
       svelte(await import('./svelte.config.js')),
 
@@ -132,7 +132,7 @@ export default [
       commonjs(),
 
       typescript({
-        include: ['src/**/*.ts', '../core/src/**/*.ts', '../core-cairo/src/**/*.ts'],
+        include: ['src/**/*.ts', '../core/solidity/src/**/*.ts', '../core/cairo/src/**/*.ts'],
         sourceMap: true,
         inlineSources: true,
       }),
diff --git a/packages/ui/src/cairo/AccessControlSection.svelte b/packages/ui/src/cairo/AccessControlSection.svelte
index b170aee1e..6ff826fc6 100644
--- a/packages/ui/src/cairo/AccessControlSection.svelte
+++ b/packages/ui/src/cairo/AccessControlSection.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Access } from '@openzeppelin/wizard-cairo';
 
-  import ToggleRadio from '../inputs/ToggleRadio.svelte';
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let access: Access;
   export let required: boolean;
diff --git a/packages/ui/src/cairo/AccountControls.svelte b/packages/ui/src/cairo/AccountControls.svelte
index c5aaa7db0..d821d7b53 100644
--- a/packages/ui/src/cairo/AccountControls.svelte
+++ b/packages/ui/src/cairo/AccountControls.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { account, Account, infoDefaults } from '@openzeppelin/wizard-cairo';
   import UpgradeabilityField from './UpgradeabilityField.svelte';
   import InfoSection from './InfoSection.svelte';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export const opts: Required<KindedOptions['Account']> = {
     kind: 'Account',
diff --git a/packages/ui/src/cairo/App.svelte b/packages/ui/src/cairo/App.svelte
index ade81e466..f14edf475 100644
--- a/packages/ui/src/cairo/App.svelte
+++ b/packages/ui/src/cairo/App.svelte
@@ -9,20 +9,20 @@
     import CustomControls from './CustomControls.svelte';
     import AccountControls from './AccountControls.svelte';
     import GovernorControls from './GovernorControls.svelte';
-    import CopyIcon from '../icons/CopyIcon.svelte';
-    import CheckIcon from '../icons/CheckIcon.svelte';
-    import DownloadIcon from '../icons/DownloadIcon.svelte';
-    import Dropdown from '../Dropdown.svelte';
-    import OverflowMenu from '../OverflowMenu.svelte';
-    import FileIcon from '../icons/FileIcon.svelte';
+    import CopyIcon from '../common/icons/CopyIcon.svelte';
+    import CheckIcon from '../common/icons/CheckIcon.svelte';
+    import DownloadIcon from '../common/icons/DownloadIcon.svelte';
+    import Dropdown from '../common/Dropdown.svelte';
+    import OverflowMenu from '../common/OverflowMenu.svelte';
+    import FileIcon from '../common/icons/FileIcon.svelte';
 
     import type { KindedOptions, Kind, Contract, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
     import { ContractBuilder, buildGeneric, printContract, sanitizeKind, OptionsError } from '@openzeppelin/wizard-cairo';
-    import { postConfig } from '../post-config';
+    import { postConfig } from '../common/post-config';
 
     import { saveAs } from 'file-saver';
     import { injectHyperlinks } from './inject-hyperlinks';
-    import { InitialOptions } from '../initial-options';
+    import { InitialOptions } from '../common/initial-options';
     import VestingControls from './VestingControls.svelte';
 
     const dispatch = createEventDispatcher();
diff --git a/packages/ui/src/cairo/CustomControls.svelte b/packages/ui/src/cairo/CustomControls.svelte
index 1770f0935..f0c80ca64 100644
--- a/packages/ui/src/cairo/CustomControls.svelte
+++ b/packages/ui/src/cairo/CustomControls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { custom, infoDefaults } from '@openzeppelin/wizard-cairo';
@@ -7,7 +7,7 @@
   import AccessControlSection from './AccessControlSection.svelte';
   import UpgradeabilityField from './UpgradeabilityField.svelte';
   import InfoSection from './InfoSection.svelte';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export const opts: Required<KindedOptions['Custom']> = {
     kind: 'Custom',
diff --git a/packages/ui/src/cairo/ERC1155Controls.svelte b/packages/ui/src/cairo/ERC1155Controls.svelte
index a292405ee..adf60c2d6 100644
--- a/packages/ui/src/cairo/ERC1155Controls.svelte
+++ b/packages/ui/src/cairo/ERC1155Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { erc1155, infoDefaults } from '@openzeppelin/wizard-cairo';
diff --git a/packages/ui/src/cairo/ERC20Controls.svelte b/packages/ui/src/cairo/ERC20Controls.svelte
index ec9e5b687..929445141 100644
--- a/packages/ui/src/cairo/ERC20Controls.svelte
+++ b/packages/ui/src/cairo/ERC20Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { premintPattern, erc20, infoDefaults } from '@openzeppelin/wizard-cairo';
@@ -7,7 +7,7 @@
   import AccessControlSection from './AccessControlSection.svelte';
   import UpgradeabilityField from './UpgradeabilityField.svelte';
   import InfoSection from './InfoSection.svelte';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export const opts: Required<KindedOptions['ERC20']> = {
     kind: 'ERC20',
diff --git a/packages/ui/src/cairo/ERC721Controls.svelte b/packages/ui/src/cairo/ERC721Controls.svelte
index 62f786016..c63edb4ed 100644
--- a/packages/ui/src/cairo/ERC721Controls.svelte
+++ b/packages/ui/src/cairo/ERC721Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { erc721, infoDefaults } from '@openzeppelin/wizard-cairo';
@@ -8,7 +8,7 @@
   import UpgradeabilityField from './UpgradeabilityField.svelte';
   import RoyaltyInfoSection from './RoyaltyInfoSection.svelte';
   import InfoSection from './InfoSection.svelte';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export const opts: Required<KindedOptions['ERC721']> = {
     kind: 'ERC721',
diff --git a/packages/ui/src/cairo/GovernorControls.svelte b/packages/ui/src/cairo/GovernorControls.svelte
index 8dcf9995d..5c11a5839 100644
--- a/packages/ui/src/cairo/GovernorControls.svelte
+++ b/packages/ui/src/cairo/GovernorControls.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { governor, infoDefaults } from '@openzeppelin/wizard-cairo';
 
-  import ToggleRadio from '../inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
   import UpgradeabilityField from './UpgradeabilityField.svelte';
   import InfoSection from './InfoSection.svelte';
 
-  import { error } from '../error-tooltip';
-  import { resizeToFit } from '../resize-to-fit';
+  import { error } from '../common/error-tooltip';
+  import { resizeToFit } from '../common/resize-to-fit';
 
   const defaults = governor.defaults;
 
diff --git a/packages/ui/src/cairo/RoyaltyInfoSection.svelte b/packages/ui/src/cairo/RoyaltyInfoSection.svelte
index 1b225bc08..a26994073 100644
--- a/packages/ui/src/cairo/RoyaltyInfoSection.svelte
+++ b/packages/ui/src/cairo/RoyaltyInfoSection.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import type { RoyaltyInfoOptions } from '@openzeppelin/wizard-cairo/src';
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
   import { royaltyInfoDefaults } from '@openzeppelin/wizard-cairo';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export let opts: RoyaltyInfoOptions = royaltyInfoDefaults;
   export let errors: undefined | OptionsErrorMessages;
diff --git a/packages/ui/src/cairo/UpgradeabilityField.svelte b/packages/ui/src/cairo/UpgradeabilityField.svelte
index fe97fb429..44433c467 100644
--- a/packages/ui/src/cairo/UpgradeabilityField.svelte
+++ b/packages/ui/src/cairo/UpgradeabilityField.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Upgradeable } from '@openzeppelin/wizard-cairo';
 
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let upgradeable: Upgradeable;
 </script>
diff --git a/packages/ui/src/cairo/VestingControls.svelte b/packages/ui/src/cairo/VestingControls.svelte
index 06fe80f81..1a51a31fa 100644
--- a/packages/ui/src/cairo/VestingControls.svelte
+++ b/packages/ui/src/cairo/VestingControls.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import HelpTooltip from '../HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard-cairo';
   import { vesting, infoDefaults } from '@openzeppelin/wizard-cairo';
 
   import InfoSection from './InfoSection.svelte';
-  import { error } from '../error-tooltip';
+  import { error } from '../common/error-tooltip';
 
   export const opts: Required<KindedOptions['Vesting']> = {
     kind: 'Vesting',
diff --git a/packages/ui/src/Dropdown.svelte b/packages/ui/src/common/Dropdown.svelte
similarity index 100%
rename from packages/ui/src/Dropdown.svelte
rename to packages/ui/src/common/Dropdown.svelte
diff --git a/packages/ui/src/HelpTooltip.svelte b/packages/ui/src/common/HelpTooltip.svelte
similarity index 100%
rename from packages/ui/src/HelpTooltip.svelte
rename to packages/ui/src/common/HelpTooltip.svelte
diff --git a/packages/ui/src/OverflowMenu.svelte b/packages/ui/src/common/OverflowMenu.svelte
similarity index 100%
rename from packages/ui/src/OverflowMenu.svelte
rename to packages/ui/src/common/OverflowMenu.svelte
diff --git a/packages/ui/src/Tooltip.svelte b/packages/ui/src/common/Tooltip.svelte
similarity index 100%
rename from packages/ui/src/Tooltip.svelte
rename to packages/ui/src/common/Tooltip.svelte
diff --git a/packages/ui/src/UnsupportedVersion.svelte b/packages/ui/src/common/UnsupportedVersion.svelte
similarity index 100%
rename from packages/ui/src/UnsupportedVersion.svelte
rename to packages/ui/src/common/UnsupportedVersion.svelte
diff --git a/packages/ui/src/error-tooltip.ts b/packages/ui/src/common/error-tooltip.ts
similarity index 100%
rename from packages/ui/src/error-tooltip.ts
rename to packages/ui/src/common/error-tooltip.ts
diff --git a/packages/ui/src/icons/ArrowsLeft.svelte b/packages/ui/src/common/icons/ArrowsLeft.svelte
similarity index 100%
rename from packages/ui/src/icons/ArrowsLeft.svelte
rename to packages/ui/src/common/icons/ArrowsLeft.svelte
diff --git a/packages/ui/src/icons/ArrowsRight.svelte b/packages/ui/src/common/icons/ArrowsRight.svelte
similarity index 100%
rename from packages/ui/src/icons/ArrowsRight.svelte
rename to packages/ui/src/common/icons/ArrowsRight.svelte
diff --git a/packages/ui/src/icons/CheckIcon.svelte b/packages/ui/src/common/icons/CheckIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/CheckIcon.svelte
rename to packages/ui/src/common/icons/CheckIcon.svelte
diff --git a/packages/ui/src/icons/CopyIcon.svelte b/packages/ui/src/common/icons/CopyIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/CopyIcon.svelte
rename to packages/ui/src/common/icons/CopyIcon.svelte
diff --git a/packages/ui/src/icons/DocsIcon.svelte b/packages/ui/src/common/icons/DocsIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/DocsIcon.svelte
rename to packages/ui/src/common/icons/DocsIcon.svelte
diff --git a/packages/ui/src/icons/DownloadIcon.svelte b/packages/ui/src/common/icons/DownloadIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/DownloadIcon.svelte
rename to packages/ui/src/common/icons/DownloadIcon.svelte
diff --git a/packages/ui/src/icons/FileIcon.svelte b/packages/ui/src/common/icons/FileIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/FileIcon.svelte
rename to packages/ui/src/common/icons/FileIcon.svelte
diff --git a/packages/ui/src/icons/ForumIcon.svelte b/packages/ui/src/common/icons/ForumIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/ForumIcon.svelte
rename to packages/ui/src/common/icons/ForumIcon.svelte
diff --git a/packages/ui/src/icons/LICENSE b/packages/ui/src/common/icons/LICENSE
similarity index 100%
rename from packages/ui/src/icons/LICENSE
rename to packages/ui/src/common/icons/LICENSE
diff --git a/packages/ui/src/icons/MaximizeIcon.svelte b/packages/ui/src/common/icons/MaximizeIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/MaximizeIcon.svelte
rename to packages/ui/src/common/icons/MaximizeIcon.svelte
diff --git a/packages/ui/src/icons/MenuDownIcon.svelte b/packages/ui/src/common/icons/MenuDownIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/MenuDownIcon.svelte
rename to packages/ui/src/common/icons/MenuDownIcon.svelte
diff --git a/packages/ui/src/icons/MinimizeIcon.svelte b/packages/ui/src/common/icons/MinimizeIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/MinimizeIcon.svelte
rename to packages/ui/src/common/icons/MinimizeIcon.svelte
diff --git a/packages/ui/src/icons/OzIcon.svelte b/packages/ui/src/common/icons/OzIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/OzIcon.svelte
rename to packages/ui/src/common/icons/OzIcon.svelte
diff --git a/packages/ui/src/icons/RemixIcon.svelte b/packages/ui/src/common/icons/RemixIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/RemixIcon.svelte
rename to packages/ui/src/common/icons/RemixIcon.svelte
diff --git a/packages/ui/src/icons/UserAvatar.svelte b/packages/ui/src/common/icons/UserAvatar.svelte
similarity index 100%
rename from packages/ui/src/icons/UserAvatar.svelte
rename to packages/ui/src/common/icons/UserAvatar.svelte
diff --git a/packages/ui/src/icons/WizAvatar.svelte b/packages/ui/src/common/icons/WizAvatar.svelte
similarity index 100%
rename from packages/ui/src/icons/WizAvatar.svelte
rename to packages/ui/src/common/icons/WizAvatar.svelte
diff --git a/packages/ui/src/icons/WizIcon.svelte b/packages/ui/src/common/icons/WizIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/WizIcon.svelte
rename to packages/ui/src/common/icons/WizIcon.svelte
diff --git a/packages/ui/src/icons/XIcon.svelte b/packages/ui/src/common/icons/XIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/XIcon.svelte
rename to packages/ui/src/common/icons/XIcon.svelte
diff --git a/packages/ui/src/icons/ZipIcon.svelte b/packages/ui/src/common/icons/ZipIcon.svelte
similarity index 100%
rename from packages/ui/src/icons/ZipIcon.svelte
rename to packages/ui/src/common/icons/ZipIcon.svelte
diff --git a/packages/ui/src/initial-options.ts b/packages/ui/src/common/initial-options.ts
similarity index 100%
rename from packages/ui/src/initial-options.ts
rename to packages/ui/src/common/initial-options.ts
diff --git a/packages/ui/src/inputs/ToggleRadio.svelte b/packages/ui/src/common/inputs/ToggleRadio.svelte
similarity index 100%
rename from packages/ui/src/inputs/ToggleRadio.svelte
rename to packages/ui/src/common/inputs/ToggleRadio.svelte
diff --git a/packages/ui/src/post-config.ts b/packages/ui/src/common/post-config.ts
similarity index 100%
rename from packages/ui/src/post-config.ts
rename to packages/ui/src/common/post-config.ts
diff --git a/packages/ui/src/post-message.ts b/packages/ui/src/common/post-message.ts
similarity index 100%
rename from packages/ui/src/post-message.ts
rename to packages/ui/src/common/post-message.ts
diff --git a/packages/ui/src/resize-to-fit.ts b/packages/ui/src/common/resize-to-fit.ts
similarity index 100%
rename from packages/ui/src/resize-to-fit.ts
rename to packages/ui/src/common/resize-to-fit.ts
diff --git a/packages/ui/src/styles/global.css b/packages/ui/src/common/styles/global.css
similarity index 100%
rename from packages/ui/src/styles/global.css
rename to packages/ui/src/common/styles/global.css
diff --git a/packages/ui/src/styles/reset.css b/packages/ui/src/common/styles/reset.css
similarity index 100%
rename from packages/ui/src/styles/reset.css
rename to packages/ui/src/common/styles/reset.css
diff --git a/packages/ui/src/styles/tippy.css b/packages/ui/src/common/styles/tippy.css
similarity index 100%
rename from packages/ui/src/styles/tippy.css
rename to packages/ui/src/common/styles/tippy.css
diff --git a/packages/ui/src/styles/utilities.css b/packages/ui/src/common/styles/utilities.css
similarity index 100%
rename from packages/ui/src/styles/utilities.css
rename to packages/ui/src/common/styles/utilities.css
diff --git a/packages/ui/src/styles/vars.css b/packages/ui/src/common/styles/vars.css
similarity index 100%
rename from packages/ui/src/styles/vars.css
rename to packages/ui/src/common/styles/vars.css
diff --git a/packages/ui/src/embed.ts b/packages/ui/src/embed.ts
index b86d32e9e..2ac1e629d 100644
--- a/packages/ui/src/embed.ts
+++ b/packages/ui/src/embed.ts
@@ -1,4 +1,4 @@
-import type { Message } from './post-message';
+import type { Message } from './common/post-message';
 
 if (!document.currentScript || !('src' in document.currentScript)) {
   throw new Error('Unknown script URL');
diff --git a/packages/ui/src/main.ts b/packages/ui/src/main.ts
index 3cb12a50a..05bfae007 100644
--- a/packages/ui/src/main.ts
+++ b/packages/ui/src/main.ts
@@ -1,14 +1,14 @@
-import './styles/global.css';
+import './common/styles/global.css';
 
 import type {} from 'svelte';
-import App from './App.svelte';
+import App from './solidity/App.svelte';
 import CairoApp from './cairo/App.svelte';
-import { postMessage } from './post-message';
-import UnsupportedVersion from './UnsupportedVersion.svelte';
+import { postMessage } from './common/post-message';
+import UnsupportedVersion from './common/UnsupportedVersion.svelte';
 import semver from 'semver';
 import { compatibleContractsSemver as compatibleSolidityContractsSemver } from '@openzeppelin/wizard';
 import { compatibleContractsSemver as compatibleCairoContractsSemver } from '@openzeppelin/wizard-cairo';
-import type { InitialOptions } from './initial-options';
+import type { InitialOptions } from './common/initial-options.ts';
 
 function postResize() {
   const { height } = document.documentElement.getBoundingClientRect();
diff --git a/packages/ui/src/AccessControlSection.svelte b/packages/ui/src/solidity/AccessControlSection.svelte
similarity index 94%
rename from packages/ui/src/AccessControlSection.svelte
rename to packages/ui/src/solidity/AccessControlSection.svelte
index 401ed2e12..5223b0055 100644
--- a/packages/ui/src/AccessControlSection.svelte
+++ b/packages/ui/src/solidity/AccessControlSection.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Access } from '@openzeppelin/wizard';
 
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
-  import HelpTooltip from './HelpTooltip.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let access: Access;
   export let required: boolean;
diff --git a/packages/ui/src/App.svelte b/packages/ui/src/solidity/App.svelte
similarity index 94%
rename from packages/ui/src/App.svelte
rename to packages/ui/src/solidity/App.svelte
index 15705bcd6..986d5f539 100644
--- a/packages/ui/src/App.svelte
+++ b/packages/ui/src/solidity/App.svelte
@@ -10,30 +10,30 @@
     import RealWorldAssetControls from './RealWorldAssetControls.svelte';
     import GovernorControls from './GovernorControls.svelte';
     import CustomControls from './CustomControls.svelte';
-    import CopyIcon from './icons/CopyIcon.svelte';
-    import CheckIcon from './icons/CheckIcon.svelte';
-    import RemixIcon from './icons/RemixIcon.svelte';
-    import DownloadIcon from './icons/DownloadIcon.svelte';
-    import ZipIcon from './icons/ZipIcon.svelte';
-    import FileIcon from './icons/FileIcon.svelte';
-    import ArrowsLeft from './icons/ArrowsLeft.svelte';
-    import ArrowsRight from './icons/ArrowsRight.svelte';
-    import Dropdown from './Dropdown.svelte';
-    import OverflowMenu from './OverflowMenu.svelte';
-    import Tooltip from './Tooltip.svelte';
+    import CopyIcon from '../common/icons/CopyIcon.svelte';
+    import CheckIcon from '../common/icons/CheckIcon.svelte';
+    import RemixIcon from '../common/icons/RemixIcon.svelte';
+    import DownloadIcon from '../common/icons/DownloadIcon.svelte';
+    import ZipIcon from '../common/icons/ZipIcon.svelte';
+    import FileIcon from '../common/icons/FileIcon.svelte';
+    import ArrowsLeft from '../common/icons/ArrowsLeft.svelte';
+    import ArrowsRight from '../common/icons/ArrowsRight.svelte';
+    import Dropdown from '../common/Dropdown.svelte';
+    import OverflowMenu from '../common/OverflowMenu.svelte';
+    import Tooltip from '../common/Tooltip.svelte';
     import Wiz from './Wiz.svelte';
     import DefenderDeployModal from './DefenderDeployModal.svelte';
 
     import type { KindedOptions, Kind, Contract, OptionsErrorMessages } from '@openzeppelin/wizard';
     import { ContractBuilder, buildGeneric, printContract, sanitizeKind, OptionsError } from '@openzeppelin/wizard';
     import { getImports } from '@openzeppelin/wizard/get-imports';
-    import { postConfig } from './post-config';
+    import { postConfig } from '../common/post-config';
     import { remixURL } from './remix';
 
     import { saveAs } from 'file-saver';
-    import { injectHyperlinks } from './utils/inject-hyperlinks';
-    import { InitialOptions } from './initial-options';
-    import { postMessageToIframe } from './post-message';
+    import { injectHyperlinks } from './inject-hyperlinks';
+    import { InitialOptions } from '../common/initial-options';
+    import { postMessageToIframe } from '../common/post-message';
 
     const dispatch = createEventDispatcher();
 
diff --git a/packages/ui/src/CustomControls.svelte b/packages/ui/src/solidity/CustomControls.svelte
similarity index 96%
rename from packages/ui/src/CustomControls.svelte
rename to packages/ui/src/solidity/CustomControls.svelte
index 4018d3f37..d5746e417 100644
--- a/packages/ui/src/CustomControls.svelte
+++ b/packages/ui/src/solidity/CustomControls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { custom, infoDefaults } from '@openzeppelin/wizard';
diff --git a/packages/ui/src/DefenderDeployModal.svelte b/packages/ui/src/solidity/DefenderDeployModal.svelte
similarity index 100%
rename from packages/ui/src/DefenderDeployModal.svelte
rename to packages/ui/src/solidity/DefenderDeployModal.svelte
diff --git a/packages/ui/src/ERC1155Controls.svelte b/packages/ui/src/solidity/ERC1155Controls.svelte
similarity index 98%
rename from packages/ui/src/ERC1155Controls.svelte
rename to packages/ui/src/solidity/ERC1155Controls.svelte
index 6157a37a5..858e6e36d 100644
--- a/packages/ui/src/ERC1155Controls.svelte
+++ b/packages/ui/src/solidity/ERC1155Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { erc1155, infoDefaults } from '@openzeppelin/wizard';
diff --git a/packages/ui/src/ERC20Controls.svelte b/packages/ui/src/solidity/ERC20Controls.svelte
similarity index 97%
rename from packages/ui/src/ERC20Controls.svelte
rename to packages/ui/src/solidity/ERC20Controls.svelte
index 1cc1a69ec..20cc69c58 100644
--- a/packages/ui/src/ERC20Controls.svelte
+++ b/packages/ui/src/solidity/ERC20Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { erc20, premintPattern, infoDefaults } from '@openzeppelin/wizard';
@@ -7,7 +7,7 @@
   import AccessControlSection from './AccessControlSection.svelte';
   import UpgradeabilitySection from './UpgradeabilitySection.svelte';
   import InfoSection from './InfoSection.svelte';
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
 
   export let opts: Required<KindedOptions['ERC20']> = {
     kind: 'ERC20',
diff --git a/packages/ui/src/ERC721Controls.svelte b/packages/ui/src/solidity/ERC721Controls.svelte
similarity index 97%
rename from packages/ui/src/ERC721Controls.svelte
rename to packages/ui/src/solidity/ERC721Controls.svelte
index 69e9bf00f..2173a970e 100644
--- a/packages/ui/src/ERC721Controls.svelte
+++ b/packages/ui/src/solidity/ERC721Controls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { erc721, infoDefaults } from '@openzeppelin/wizard';
@@ -7,7 +7,7 @@
   import AccessControlSection from './AccessControlSection.svelte';
   import UpgradeabilitySection from './UpgradeabilitySection.svelte';
   import InfoSection from './InfoSection.svelte';
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
   
   export let opts: Required<KindedOptions['ERC721']> = {
     kind: 'ERC721',
diff --git a/packages/ui/src/GovernorControls.svelte b/packages/ui/src/solidity/GovernorControls.svelte
similarity index 97%
rename from packages/ui/src/GovernorControls.svelte
rename to packages/ui/src/solidity/GovernorControls.svelte
index b7dda9605..01f477624 100644
--- a/packages/ui/src/GovernorControls.svelte
+++ b/packages/ui/src/solidity/GovernorControls.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions, OptionsErrorMessages } from '@openzeppelin/wizard';
   import { governor, infoDefaults } from '@openzeppelin/wizard';
 
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
   import UpgradeabilitySection from './UpgradeabilitySection.svelte';
   import InfoSection from './InfoSection.svelte';
   
-  import { error } from './error-tooltip';
-  import { resizeToFit } from './resize-to-fit';
+  import { error } from '../common/error-tooltip';
+  import { resizeToFit } from '../common/resize-to-fit';
 
   const defaults = governor.defaults;
 
diff --git a/packages/ui/src/InfoSection.svelte b/packages/ui/src/solidity/InfoSection.svelte
similarity index 94%
rename from packages/ui/src/InfoSection.svelte
rename to packages/ui/src/solidity/InfoSection.svelte
index 6fcbbfded..d1e784cdc 100644
--- a/packages/ui/src/InfoSection.svelte
+++ b/packages/ui/src/solidity/InfoSection.svelte
@@ -2,7 +2,7 @@
   import type { Info } from '@openzeppelin/wizard';
   import { infoDefaults } from '@openzeppelin/wizard';
 
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let info: Info;
 </script>
diff --git a/packages/ui/src/RealWorldAssetControls.svelte b/packages/ui/src/solidity/RealWorldAssetControls.svelte
similarity index 98%
rename from packages/ui/src/RealWorldAssetControls.svelte
rename to packages/ui/src/solidity/RealWorldAssetControls.svelte
index 171e1c03d..62dfaaa25 100644
--- a/packages/ui/src/RealWorldAssetControls.svelte
+++ b/packages/ui/src/solidity/RealWorldAssetControls.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { realWorldAsset, premintPattern, infoDefaults } from '@openzeppelin/wizard';
 
   import AccessControlSection from './AccessControlSection.svelte';
   import InfoSection from './InfoSection.svelte';
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
 
   export let opts: Required<KindedOptions['RealWorldAsset']> = {
     kind: 'RealWorldAsset',
diff --git a/packages/ui/src/StablecoinControls.svelte b/packages/ui/src/solidity/StablecoinControls.svelte
similarity index 98%
rename from packages/ui/src/StablecoinControls.svelte
rename to packages/ui/src/solidity/StablecoinControls.svelte
index a7363a4e1..26b473d11 100644
--- a/packages/ui/src/StablecoinControls.svelte
+++ b/packages/ui/src/solidity/StablecoinControls.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import HelpTooltip from './HelpTooltip.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   import type { KindedOptions } from '@openzeppelin/wizard';
   import { stablecoin, premintPattern, infoDefaults } from '@openzeppelin/wizard';
 
   import AccessControlSection from './AccessControlSection.svelte';
   import InfoSection from './InfoSection.svelte';
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
 
   export let opts: Required<KindedOptions['Stablecoin']> = {
     kind: 'Stablecoin',
diff --git a/packages/ui/src/UpgradeabilitySection.svelte b/packages/ui/src/solidity/UpgradeabilitySection.svelte
similarity index 92%
rename from packages/ui/src/UpgradeabilitySection.svelte
rename to packages/ui/src/solidity/UpgradeabilitySection.svelte
index 28fb8b7ed..06105fe27 100644
--- a/packages/ui/src/UpgradeabilitySection.svelte
+++ b/packages/ui/src/solidity/UpgradeabilitySection.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Upgradeable } from '@openzeppelin/wizard';
 
-  import ToggleRadio from './inputs/ToggleRadio.svelte';
-  import HelpTooltip from './HelpTooltip.svelte';
+  import ToggleRadio from '../common/inputs/ToggleRadio.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let upgradeable: Upgradeable;
 </script>
diff --git a/packages/ui/src/Wiz.svelte b/packages/ui/src/solidity/Wiz.svelte
similarity index 95%
rename from packages/ui/src/Wiz.svelte
rename to packages/ui/src/solidity/Wiz.svelte
index d8e64352c..346f8e8b8 100644
--- a/packages/ui/src/Wiz.svelte
+++ b/packages/ui/src/solidity/Wiz.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import UserAvatar from './icons/UserAvatar.svelte';
-  import WizAvatar from './icons/WizAvatar.svelte'
-  import WizIcon from './icons/WizIcon.svelte'
-  import XIcon from './icons/XIcon.svelte';
+  import UserAvatar from '../common/icons/UserAvatar.svelte';
+  import WizAvatar from '../common/icons/WizAvatar.svelte'
+  import WizIcon from '../common/icons/WizIcon.svelte'
+  import XIcon from '../common/icons/XIcon.svelte';
   import type { GenericOptions } from '@openzeppelin/wizard';
   import { nanoid } from 'nanoid';
-  import MinimizeIcon from './icons/MinimizeIcon.svelte';
-  import MaximizeIcon from './icons/MaximizeIcon.svelte';
-  import HelpTooltip from './HelpTooltip.svelte';
+  import MinimizeIcon from '../common/icons/MinimizeIcon.svelte';
+  import MaximizeIcon from '../common/icons/MaximizeIcon.svelte';
+  import HelpTooltip from '../common/HelpTooltip.svelte';
 
   export let functionCall: {
     name?: string,
diff --git a/packages/ui/src/highlightjs.ts b/packages/ui/src/solidity/highlightjs.ts
similarity index 100%
rename from packages/ui/src/highlightjs.ts
rename to packages/ui/src/solidity/highlightjs.ts
diff --git a/packages/ui/src/utils/inject-hyperlinks.ts b/packages/ui/src/solidity/inject-hyperlinks.ts
similarity index 100%
rename from packages/ui/src/utils/inject-hyperlinks.ts
rename to packages/ui/src/solidity/inject-hyperlinks.ts
diff --git a/packages/ui/src/remix.ts b/packages/ui/src/solidity/remix.ts
similarity index 100%
rename from packages/ui/src/remix.ts
rename to packages/ui/src/solidity/remix.ts
diff --git a/packages/ui/src/wiz-functions.ts b/packages/ui/src/solidity/wiz-functions.ts
similarity index 100%
rename from packages/ui/src/wiz-functions.ts
rename to packages/ui/src/solidity/wiz-functions.ts
diff --git a/packages/ui/src/standalone.css b/packages/ui/src/standalone.css
index 58b90225d..339ae4155 100644
--- a/packages/ui/src/standalone.css
+++ b/packages/ui/src/standalone.css
@@ -1,5 +1,5 @@
 @tailwind utilities;
-@import "styles/vars.css";
+@import "common/styles/vars.css";
 
 body {
   font-family: Helvetica, Arial, sans-serif;
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index e3669d435..d15cb2f27 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -5,6 +5,6 @@
     "lib": ["dom", "dom.iterable", "es2019", "es2019.array"],
     "skipLibCheck": true
   },
-  "include": ["src/**/*", "../core/src/**/*", "../core-cairo/src/**/*"],
+  "include": ["src/**/*", "../core/solidity/src/**/*", "../core/cairo/src/**/*"],
   "exclude": ["node_modules/*", "__sapper__/*", "public/*"]
 }