OpenZeppelin · ericglau · Feb 5, 2025 · Feb 4, 2025 · Feb 4, 2025 · Feb 4, 2025
diff --git 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
@@ -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
@@ -6,7 +6,8 @@
   },
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/core/*",
+      "packages/ui"
     ],
     "nohoist": [
       "**/@types/*",

diff --git a/packages/core-cairo/.gitignore → packages/core/cairo/.gitignore b/packages/core-cairo/.gitignore → packages/core/cairo/.gitignore
diff --git a/packages/core-cairo/CHANGELOG.md → packages/core/cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md → packages/core/cairo/CHANGELOG.md
diff --git a/packages/core-cairo/LICENSE → packages/core/cairo/LICENSE b/packages/core-cairo/LICENSE → packages/core/cairo/LICENSE
diff --git a/packages/core-cairo/NOTICE → packages/core/cairo/NOTICE b/packages/core-cairo/NOTICE → packages/core/cairo/NOTICE
diff --git a/packages/core-cairo/README.md → packages/core/cairo/README.md b/packages/core-cairo/README.md → packages/core/cairo/README.md
diff --git a/packages/core-cairo/ava.config.js → packages/core/cairo/ava.config.js b/packages/core-cairo/ava.config.js → packages/core/cairo/ava.config.js
diff --git a/packages/core-cairo/package.json → packages/core/cairo/package.json b/packages/core-cairo/package.json → 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 → packages/core/cairo/src/account.test.ts b/packages/core-cairo/src/account.test.ts → packages/core/cairo/src/account.test.ts
diff --git a/packages/core-cairo/src/account.test.ts.md → packages/core/cairo/src/account.test.ts.md b/packages/core-cairo/src/account.test.ts.md → packages/core/cairo/src/account.test.ts.md
diff --git a/packages/core-cairo/src/account.test.ts.snap → packages/core/cairo/src/account.test.ts.snap b/packages/core-cairo/src/account.test.ts.snap → packages/core/cairo/src/account.test.ts.snap
diff --git a/packages/core-cairo/src/account.ts → packages/core/cairo/src/account.ts b/packages/core-cairo/src/account.ts → packages/core/cairo/src/account.ts
diff --git a/packages/core-cairo/src/add-pausable.ts → packages/core/cairo/src/add-pausable.ts b/packages/core-cairo/src/add-pausable.ts → packages/core/cairo/src/add-pausable.ts
diff --git a/packages/core-cairo/src/api.ts → packages/core/cairo/src/api.ts b/packages/core-cairo/src/api.ts → packages/core/cairo/src/api.ts
diff --git a/packages/core-cairo/src/build-generic.ts → packages/core/cairo/src/build-generic.ts b/packages/core-cairo/src/build-generic.ts → packages/core/cairo/src/build-generic.ts
diff --git a/packages/core-cairo/src/common-components.ts → packages/core/cairo/src/common-components.ts b/packages/core-cairo/src/common-components.ts → packages/core/cairo/src/common-components.ts
diff --git a/packages/core-cairo/src/common-options.ts → packages/core/cairo/src/common-options.ts b/packages/core-cairo/src/common-options.ts → packages/core/cairo/src/common-options.ts
diff --git a/packages/core-cairo/src/contract.test.ts → packages/core/cairo/src/contract.test.ts b/packages/core-cairo/src/contract.test.ts → packages/core/cairo/src/contract.test.ts
diff --git a/packages/core-cairo/src/contract.test.ts.md → packages/core/cairo/src/contract.test.ts.md b/packages/core-cairo/src/contract.test.ts.md → packages/core/cairo/src/contract.test.ts.md
diff --git a/...ages/core-cairo/src/contract.test.ts.snap → ...ages/core/cairo/src/contract.test.ts.snap b/...ages/core-cairo/src/contract.test.ts.snap → ...ages/core/cairo/src/contract.test.ts.snap
diff --git a/packages/core-cairo/src/contract.ts → packages/core/cairo/src/contract.ts b/packages/core-cairo/src/contract.ts → packages/core/cairo/src/contract.ts
diff --git a/packages/core-cairo/src/custom.test.ts → packages/core/cairo/src/custom.test.ts b/packages/core-cairo/src/custom.test.ts → packages/core/cairo/src/custom.test.ts
diff --git a/packages/core-cairo/src/custom.test.ts.md → packages/core/cairo/src/custom.test.ts.md b/packages/core-cairo/src/custom.test.ts.md → packages/core/cairo/src/custom.test.ts.md
diff --git a/packages/core-cairo/src/custom.test.ts.snap → packages/core/cairo/src/custom.test.ts.snap b/packages/core-cairo/src/custom.test.ts.snap → packages/core/cairo/src/custom.test.ts.snap
diff --git a/packages/core-cairo/src/custom.ts → packages/core/cairo/src/custom.ts b/packages/core-cairo/src/custom.ts → packages/core/cairo/src/custom.ts
diff --git a/packages/core-cairo/src/erc1155.test.ts → packages/core/cairo/src/erc1155.test.ts b/packages/core-cairo/src/erc1155.test.ts → packages/core/cairo/src/erc1155.test.ts
diff --git a/packages/core-cairo/src/erc1155.test.ts.md → packages/core/cairo/src/erc1155.test.ts.md b/packages/core-cairo/src/erc1155.test.ts.md → packages/core/cairo/src/erc1155.test.ts.md
diff --git a/packages/core-cairo/src/erc1155.test.ts.snap → packages/core/cairo/src/erc1155.test.ts.snap b/packages/core-cairo/src/erc1155.test.ts.snap → packages/core/cairo/src/erc1155.test.ts.snap
diff --git a/packages/core-cairo/src/erc1155.ts → packages/core/cairo/src/erc1155.ts b/packages/core-cairo/src/erc1155.ts → packages/core/cairo/src/erc1155.ts
diff --git a/packages/core-cairo/src/erc20.test.ts → packages/core/cairo/src/erc20.test.ts b/packages/core-cairo/src/erc20.test.ts → packages/core/cairo/src/erc20.test.ts
diff --git a/packages/core-cairo/src/erc20.test.ts.md → packages/core/cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md → packages/core/cairo/src/erc20.test.ts.md
diff --git a/packages/core-cairo/src/erc20.test.ts.snap → packages/core/cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap → packages/core/cairo/src/erc20.test.ts.snap
diff --git a/packages/core-cairo/src/erc20.ts → packages/core/cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts → packages/core/cairo/src/erc20.ts
diff --git a/packages/core-cairo/src/erc721.test.ts → packages/core/cairo/src/erc721.test.ts b/packages/core-cairo/src/erc721.test.ts → packages/core/cairo/src/erc721.test.ts
diff --git a/packages/core-cairo/src/erc721.test.ts.md → packages/core/cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md → packages/core/cairo/src/erc721.test.ts.md
diff --git a/packages/core-cairo/src/erc721.test.ts.snap → packages/core/cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap → packages/core/cairo/src/erc721.test.ts.snap
diff --git a/packages/core-cairo/src/erc721.ts → packages/core/cairo/src/erc721.ts b/packages/core-cairo/src/erc721.ts → packages/core/cairo/src/erc721.ts
diff --git a/packages/core-cairo/src/error.ts → packages/core/cairo/src/error.ts b/packages/core-cairo/src/error.ts → packages/core/cairo/src/error.ts
diff --git a/packages/core-cairo/src/external-trait.ts → packages/core/cairo/src/external-trait.ts b/packages/core-cairo/src/external-trait.ts → packages/core/cairo/src/external-trait.ts
diff --git a/packages/core-cairo/src/generate/account.ts → packages/core/cairo/src/generate/account.ts b/packages/core-cairo/src/generate/account.ts → packages/core/cairo/src/generate/account.ts
diff --git a/...s/core-cairo/src/generate/alternatives.ts → ...s/core/cairo/src/generate/alternatives.ts b/...s/core-cairo/src/generate/alternatives.ts → ...s/core/cairo/src/generate/alternatives.ts
diff --git a/packages/core-cairo/src/generate/custom.ts → packages/core/cairo/src/generate/custom.ts b/packages/core-cairo/src/generate/custom.ts → packages/core/cairo/src/generate/custom.ts
diff --git a/packages/core-cairo/src/generate/erc1155.ts → packages/core/cairo/src/generate/erc1155.ts b/packages/core-cairo/src/generate/erc1155.ts → packages/core/cairo/src/generate/erc1155.ts
diff --git a/packages/core-cairo/src/generate/erc20.ts → packages/core/cairo/src/generate/erc20.ts b/packages/core-cairo/src/generate/erc20.ts → packages/core/cairo/src/generate/erc20.ts
diff --git a/packages/core-cairo/src/generate/erc721.ts → packages/core/cairo/src/generate/erc721.ts b/packages/core-cairo/src/generate/erc721.ts → packages/core/cairo/src/generate/erc721.ts
diff --git a/packages/core-cairo/src/generate/governor.ts → packages/core/cairo/src/generate/governor.ts b/packages/core-cairo/src/generate/governor.ts → packages/core/cairo/src/generate/governor.ts
diff --git a/packages/core-cairo/src/generate/sources.ts → packages/core/cairo/src/generate/sources.ts b/packages/core-cairo/src/generate/sources.ts → packages/core/cairo/src/generate/sources.ts
diff --git a/packages/core-cairo/src/generate/vesting.ts → packages/core/cairo/src/generate/vesting.ts b/packages/core-cairo/src/generate/vesting.ts → packages/core/cairo/src/generate/vesting.ts
diff --git a/packages/core-cairo/src/governor.test.ts → packages/core/cairo/src/governor.test.ts b/packages/core-cairo/src/governor.test.ts → packages/core/cairo/src/governor.test.ts
diff --git a/packages/core-cairo/src/governor.test.ts.md → packages/core/cairo/src/governor.test.ts.md b/packages/core-cairo/src/governor.test.ts.md → packages/core/cairo/src/governor.test.ts.md
diff --git a/...ages/core-cairo/src/governor.test.ts.snap → ...ages/core/cairo/src/governor.test.ts.snap b/...ages/core-cairo/src/governor.test.ts.snap → ...ages/core/cairo/src/governor.test.ts.snap
diff --git a/packages/core-cairo/src/governor.ts → packages/core/cairo/src/governor.ts b/packages/core-cairo/src/governor.ts → packages/core/cairo/src/governor.ts
diff --git a/packages/core-cairo/src/index.ts → packages/core/cairo/src/index.ts b/packages/core-cairo/src/index.ts → packages/core/cairo/src/index.ts
diff --git a/packages/core-cairo/src/kind.ts → packages/core/cairo/src/kind.ts b/packages/core-cairo/src/kind.ts → packages/core/cairo/src/kind.ts
diff --git a/packages/core-cairo/src/print.ts → packages/core/cairo/src/print.ts b/packages/core-cairo/src/print.ts → packages/core/cairo/src/print.ts
diff --git a/...cairo/src/scripts/update-scarb-project.ts → ...cairo/src/scripts/update-scarb-project.ts b/...cairo/src/scripts/update-scarb-project.ts → ...cairo/src/scripts/update-scarb-project.ts
diff --git a/...ages/core-cairo/src/set-access-control.ts → ...ages/core/cairo/src/set-access-control.ts b/...ages/core-cairo/src/set-access-control.ts → ...ages/core/cairo/src/set-access-control.ts
diff --git a/packages/core-cairo/src/set-info.ts → packages/core/cairo/src/set-info.ts b/packages/core-cairo/src/set-info.ts → packages/core/cairo/src/set-info.ts
diff --git a/packages/core-cairo/src/set-royalty-info.ts → packages/core/cairo/src/set-royalty-info.ts b/packages/core-cairo/src/set-royalty-info.ts → packages/core/cairo/src/set-royalty-info.ts
diff --git a/packages/core-cairo/src/set-upgradeable.ts → packages/core/cairo/src/set-upgradeable.ts b/packages/core-cairo/src/set-upgradeable.ts → packages/core/cairo/src/set-upgradeable.ts
diff --git a/packages/core-cairo/src/test.ts → packages/core/cairo/src/test.ts b/packages/core-cairo/src/test.ts → packages/core/cairo/src/test.ts
diff --git a/...e-cairo/src/utils/convert-strings.test.ts → ...e/cairo/src/utils/convert-strings.test.ts b/...e-cairo/src/utils/convert-strings.test.ts → ...e/cairo/src/utils/convert-strings.test.ts
diff --git a/...s/core-cairo/src/utils/convert-strings.ts → ...s/core/cairo/src/utils/convert-strings.ts b/...s/core-cairo/src/utils/convert-strings.ts → ...s/core/cairo/src/utils/convert-strings.ts
diff --git a/...core-cairo/src/utils/define-components.ts → ...core/cairo/src/utils/define-components.ts b/...core-cairo/src/utils/define-components.ts → ...core/cairo/src/utils/define-components.ts
diff --git a/.../core-cairo/src/utils/define-functions.ts → .../core/cairo/src/utils/define-functions.ts b/.../core-cairo/src/utils/define-functions.ts → .../core/cairo/src/utils/define-functions.ts
diff --git a/packages/core-cairo/src/utils/duration.ts → packages/core/cairo/src/utils/duration.ts b/packages/core-cairo/src/utils/duration.ts → packages/core/cairo/src/utils/duration.ts
diff --git a/packages/core-cairo/src/utils/find-cover.ts → packages/core/cairo/src/utils/find-cover.ts b/packages/core-cairo/src/utils/find-cover.ts → packages/core/cairo/src/utils/find-cover.ts
diff --git a/...ages/core-cairo/src/utils/format-lines.ts → ...ages/core/cairo/src/utils/format-lines.ts b/...ages/core-cairo/src/utils/format-lines.ts → ...ages/core/cairo/src/utils/format-lines.ts
diff --git a/packages/core-cairo/src/utils/sorted-by.ts → packages/core/cairo/src/utils/sorted-by.ts b/packages/core-cairo/src/utils/sorted-by.ts → packages/core/cairo/src/utils/sorted-by.ts
diff --git a/...ages/core-cairo/src/utils/version.test.ts → ...ages/core/cairo/src/utils/version.test.ts b/...ages/core-cairo/src/utils/version.test.ts → ...ages/core/cairo/src/utils/version.test.ts
diff --git a/packages/core-cairo/src/utils/version.ts → packages/core/cairo/src/utils/version.ts b/packages/core-cairo/src/utils/version.ts → packages/core/cairo/src/utils/version.ts
diff --git a/packages/core-cairo/src/vesting.test.ts → packages/core/cairo/src/vesting.test.ts b/packages/core-cairo/src/vesting.test.ts → packages/core/cairo/src/vesting.test.ts
diff --git a/packages/core-cairo/src/vesting.test.ts.md → packages/core/cairo/src/vesting.test.ts.md b/packages/core-cairo/src/vesting.test.ts.md → packages/core/cairo/src/vesting.test.ts.md
diff --git a/packages/core-cairo/src/vesting.test.ts.snap → packages/core/cairo/src/vesting.test.ts.snap b/packages/core-cairo/src/vesting.test.ts.snap → packages/core/cairo/src/vesting.test.ts.snap
diff --git a/packages/core-cairo/src/vesting.ts → packages/core/cairo/src/vesting.ts b/packages/core-cairo/src/vesting.ts → packages/core/cairo/src/vesting.ts
diff --git a/packages/core-cairo/test_project/.gitignore → packages/core/cairo/test_project/.gitignore b/packages/core-cairo/test_project/.gitignore → packages/core/cairo/test_project/.gitignore
diff --git a/packages/core-cairo/test_project/Scarb.lock → packages/core/cairo/test_project/Scarb.lock b/packages/core-cairo/test_project/Scarb.lock → packages/core/cairo/test_project/Scarb.lock
diff --git a/packages/core-cairo/test_project/Scarb.toml → packages/core/cairo/test_project/Scarb.toml b/packages/core-cairo/test_project/Scarb.toml → packages/core/cairo/test_project/Scarb.toml
diff --git a/packages/core-cairo/tsconfig.json → packages/core/cairo/tsconfig.json b/packages/core-cairo/tsconfig.json → 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 → packages/core/solidity/.gitignore b/packages/core/.gitignore → packages/core/solidity/.gitignore
diff --git a/packages/core/CHANGELOG.md → packages/core/solidity/CHANGELOG.md b/packages/core/CHANGELOG.md → packages/core/solidity/CHANGELOG.md
diff --git a/packages/core/LICENSE → packages/core/solidity/LICENSE b/packages/core/LICENSE → packages/core/solidity/LICENSE
diff --git a/packages/core/NOTICE → packages/core/solidity/NOTICE b/packages/core/NOTICE → packages/core/solidity/NOTICE
diff --git a/packages/core/README.md → packages/core/solidity/README.md b/packages/core/README.md → packages/core/solidity/README.md
diff --git a/packages/core/ava.config.js → packages/core/solidity/ava.config.js b/packages/core/ava.config.js → packages/core/solidity/ava.config.js
diff --git a/packages/core/contracts/SafetyCheck.sol → ...s/core/solidity/contracts/SafetyCheck.sol b/packages/core/contracts/SafetyCheck.sol → ...s/core/solidity/contracts/SafetyCheck.sol
diff --git a/packages/core/get-imports.d.ts → packages/core/solidity/get-imports.d.ts b/packages/core/get-imports.d.ts → packages/core/solidity/get-imports.d.ts
diff --git a/packages/core/get-imports.js → packages/core/solidity/get-imports.js b/packages/core/get-imports.js → packages/core/solidity/get-imports.js
diff --git a/packages/core/hardhat.config.js → packages/core/solidity/hardhat.config.js b/packages/core/hardhat.config.js → packages/core/solidity/hardhat.config.js
diff --git a/packages/core/openzeppelin-contracts.d.ts → ...core/solidity/openzeppelin-contracts.d.ts b/packages/core/openzeppelin-contracts.d.ts → ...core/solidity/openzeppelin-contracts.d.ts
diff --git a/packages/core/package.json → packages/core/solidity/package.json b/packages/core/package.json → 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 → packages/core/solidity/print-versioned.js b/packages/core/print-versioned.js → packages/core/solidity/print-versioned.js
diff --git a/packages/core/print-versioned.ts → packages/core/solidity/print-versioned.ts b/packages/core/print-versioned.ts → packages/core/solidity/print-versioned.ts
diff --git a/packages/core/src/add-pausable.ts → packages/core/solidity/src/add-pausable.ts b/packages/core/src/add-pausable.ts → packages/core/solidity/src/add-pausable.ts
diff --git a/packages/core/src/api.ts → packages/core/solidity/src/api.ts b/packages/core/src/api.ts → packages/core/solidity/src/api.ts
diff --git a/packages/core/src/build-generic.ts → packages/core/solidity/src/build-generic.ts b/packages/core/src/build-generic.ts → packages/core/solidity/src/build-generic.ts
diff --git a/packages/core/src/common-functions.ts → ...ges/core/solidity/src/common-functions.ts b/packages/core/src/common-functions.ts → ...ges/core/solidity/src/common-functions.ts
diff --git a/packages/core/src/common-options.ts → packages/core/solidity/src/common-options.ts b/packages/core/src/common-options.ts → packages/core/solidity/src/common-options.ts
diff --git a/packages/core/src/contract.test.ts → packages/core/solidity/src/contract.test.ts b/packages/core/src/contract.test.ts → packages/core/solidity/src/contract.test.ts
diff --git a/packages/core/src/contract.test.ts.md → ...ges/core/solidity/src/contract.test.ts.md b/packages/core/src/contract.test.ts.md → ...ges/core/solidity/src/contract.test.ts.md
diff --git a/packages/core/src/contract.test.ts.snap → ...s/core/solidity/src/contract.test.ts.snap b/packages/core/src/contract.test.ts.snap → ...s/core/solidity/src/contract.test.ts.snap
diff --git a/packages/core/src/contract.ts → packages/core/solidity/src/contract.ts b/packages/core/src/contract.ts → packages/core/solidity/src/contract.ts
diff --git a/packages/core/src/custom.test.ts → packages/core/solidity/src/custom.test.ts b/packages/core/src/custom.test.ts → packages/core/solidity/src/custom.test.ts
diff --git a/packages/core/src/custom.test.ts.md → packages/core/solidity/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md → packages/core/solidity/src/custom.test.ts.md
diff --git a/packages/core/src/custom.test.ts.snap → ...ges/core/solidity/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap → ...ges/core/solidity/src/custom.test.ts.snap
diff --git a/packages/core/src/custom.ts → packages/core/solidity/src/custom.ts b/packages/core/src/custom.ts → packages/core/solidity/src/custom.ts
diff --git a/...rc/environments/hardhat/package-lock.json → ...rc/environments/hardhat/package-lock.json b/...rc/environments/hardhat/package-lock.json → ...rc/environments/hardhat/package-lock.json
diff --git a/...ore/src/environments/hardhat/package.json → ...ity/src/environments/hardhat/package.json b/...ore/src/environments/hardhat/package.json → ...ity/src/environments/hardhat/package.json
diff --git a/...nts/hardhat/upgradeable/package-lock.json → ...nts/hardhat/upgradeable/package-lock.json b/...nts/hardhat/upgradeable/package-lock.json → ...nts/hardhat/upgradeable/package-lock.json
diff --git a/...ronments/hardhat/upgradeable/package.json → ...ronments/hardhat/upgradeable/package.json b/...ronments/hardhat/upgradeable/package.json → ...ronments/hardhat/upgradeable/package.json
diff --git a/packages/core/src/erc1155.test.ts → packages/core/solidity/src/erc1155.test.ts b/packages/core/src/erc1155.test.ts → packages/core/solidity/src/erc1155.test.ts
diff --git a/packages/core/src/erc1155.test.ts.md → ...ages/core/solidity/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md → ...ages/core/solidity/src/erc1155.test.ts.md
diff --git a/packages/core/src/erc1155.test.ts.snap → ...es/core/solidity/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap → ...es/core/solidity/src/erc1155.test.ts.snap
diff --git a/packages/core/src/erc1155.ts → packages/core/solidity/src/erc1155.ts b/packages/core/src/erc1155.ts → packages/core/solidity/src/erc1155.ts
diff --git a/packages/core/src/erc20.test.ts → packages/core/solidity/src/erc20.test.ts b/packages/core/src/erc20.test.ts → packages/core/solidity/src/erc20.test.ts
diff --git a/packages/core/src/erc20.test.ts.md → packages/core/solidity/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md → packages/core/solidity/src/erc20.test.ts.md
diff --git a/packages/core/src/erc20.test.ts.snap → ...ages/core/solidity/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap → ...ages/core/solidity/src/erc20.test.ts.snap
diff --git a/packages/core/src/erc20.ts → packages/core/solidity/src/erc20.ts b/packages/core/src/erc20.ts → packages/core/solidity/src/erc20.ts
diff --git a/packages/core/src/erc721.test.ts → packages/core/solidity/src/erc721.test.ts b/packages/core/src/erc721.test.ts → packages/core/solidity/src/erc721.test.ts
diff --git a/packages/core/src/erc721.test.ts.md → packages/core/solidity/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md → packages/core/solidity/src/erc721.test.ts.md
diff --git a/packages/core/src/erc721.test.ts.snap → ...ges/core/solidity/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap → ...ges/core/solidity/src/erc721.test.ts.snap
diff --git a/packages/core/src/erc721.ts → packages/core/solidity/src/erc721.ts b/packages/core/src/erc721.ts → packages/core/solidity/src/erc721.ts
diff --git a/packages/core/src/error.ts → packages/core/solidity/src/error.ts b/packages/core/src/error.ts → packages/core/solidity/src/error.ts
diff --git a/packages/core/src/generate/alternatives.ts → ...ore/solidity/src/generate/alternatives.ts b/packages/core/src/generate/alternatives.ts → ...ore/solidity/src/generate/alternatives.ts
diff --git a/packages/core/src/generate/custom.ts → ...ages/core/solidity/src/generate/custom.ts b/packages/core/src/generate/custom.ts → ...ages/core/solidity/src/generate/custom.ts
diff --git a/packages/core/src/generate/erc1155.ts → ...ges/core/solidity/src/generate/erc1155.ts b/packages/core/src/generate/erc1155.ts → ...ges/core/solidity/src/generate/erc1155.ts
diff --git a/packages/core/src/generate/erc20.ts → packages/core/solidity/src/generate/erc20.ts b/packages/core/src/generate/erc20.ts → packages/core/solidity/src/generate/erc20.ts
diff --git a/packages/core/src/generate/erc721.ts → ...ages/core/solidity/src/generate/erc721.ts b/packages/core/src/generate/erc721.ts → ...ages/core/solidity/src/generate/erc721.ts
diff --git a/packages/core/src/generate/governor.ts → ...es/core/solidity/src/generate/governor.ts b/packages/core/src/generate/governor.ts → ...es/core/solidity/src/generate/governor.ts
diff --git a/packages/core/src/generate/sources.ts → ...ges/core/solidity/src/generate/sources.ts b/packages/core/src/generate/sources.ts → ...ges/core/solidity/src/generate/sources.ts
diff --git a/packages/core/src/generate/stablecoin.ts → .../core/solidity/src/generate/stablecoin.ts b/packages/core/src/generate/stablecoin.ts → .../core/solidity/src/generate/stablecoin.ts
diff --git a/packages/core/src/get-imports.test.ts → ...ges/core/solidity/src/get-imports.test.ts b/packages/core/src/get-imports.test.ts → ...ges/core/solidity/src/get-imports.test.ts
diff --git a/packages/core/src/get-imports.ts → packages/core/solidity/src/get-imports.ts b/packages/core/src/get-imports.ts → packages/core/solidity/src/get-imports.ts
diff --git a/packages/core/src/governor.test.ts → packages/core/solidity/src/governor.test.ts b/packages/core/src/governor.test.ts → packages/core/solidity/src/governor.test.ts
diff --git a/packages/core/src/governor.test.ts.md → ...ges/core/solidity/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md → ...ges/core/solidity/src/governor.test.ts.md
diff --git a/packages/core/src/governor.test.ts.snap → ...s/core/solidity/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap → ...s/core/solidity/src/governor.test.ts.snap
diff --git a/packages/core/src/governor.ts → packages/core/solidity/src/governor.ts b/packages/core/src/governor.ts → packages/core/solidity/src/governor.ts
diff --git a/packages/core/src/index.ts → packages/core/solidity/src/index.ts b/packages/core/src/index.ts → packages/core/solidity/src/index.ts
diff --git a/packages/core/src/infer-transpiled.test.ts → ...ore/solidity/src/infer-transpiled.test.ts b/packages/core/src/infer-transpiled.test.ts → ...ore/solidity/src/infer-transpiled.test.ts
diff --git a/packages/core/src/infer-transpiled.ts → ...ges/core/solidity/src/infer-transpiled.ts b/packages/core/src/infer-transpiled.ts → ...ges/core/solidity/src/infer-transpiled.ts
diff --git a/packages/core/src/kind.ts → packages/core/solidity/src/kind.ts b/packages/core/src/kind.ts → packages/core/solidity/src/kind.ts
diff --git a/packages/core/src/options.ts → packages/core/solidity/src/options.ts b/packages/core/src/options.ts → packages/core/solidity/src/options.ts
diff --git a/packages/core/src/print-versioned.ts → ...ages/core/solidity/src/print-versioned.ts b/packages/core/src/print-versioned.ts → ...ages/core/solidity/src/print-versioned.ts
diff --git a/packages/core/src/print.ts → packages/core/solidity/src/print.ts b/packages/core/src/print.ts → packages/core/solidity/src/print.ts
diff --git a/packages/core/src/scripts/prepare.ts → ...ages/core/solidity/src/scripts/prepare.ts b/packages/core/src/scripts/prepare.ts → ...ages/core/solidity/src/scripts/prepare.ts
diff --git a/packages/core/src/set-access-control.ts → ...s/core/solidity/src/set-access-control.ts b/packages/core/src/set-access-control.ts → ...s/core/solidity/src/set-access-control.ts
diff --git a/packages/core/src/set-clock-mode.ts → packages/core/solidity/src/set-clock-mode.ts b/packages/core/src/set-clock-mode.ts → packages/core/solidity/src/set-clock-mode.ts
diff --git a/packages/core/src/set-info.ts → packages/core/solidity/src/set-info.ts b/packages/core/src/set-info.ts → packages/core/solidity/src/set-info.ts
diff --git a/packages/core/src/set-upgradeable.ts → ...ages/core/solidity/src/set-upgradeable.ts b/packages/core/src/set-upgradeable.ts → ...ages/core/solidity/src/set-upgradeable.ts
diff --git a/packages/core/src/solidity-version.json → ...s/core/solidity/src/solidity-version.json b/packages/core/src/solidity-version.json → ...s/core/solidity/src/solidity-version.json
diff --git a/packages/core/src/stablecoin.test.ts → ...ages/core/solidity/src/stablecoin.test.ts b/packages/core/src/stablecoin.test.ts → ...ages/core/solidity/src/stablecoin.test.ts
diff --git a/packages/core/src/stablecoin.test.ts.md → ...s/core/solidity/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md → ...s/core/solidity/src/stablecoin.test.ts.md
diff --git a/packages/core/src/stablecoin.test.ts.snap → ...core/solidity/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap → ...core/solidity/src/stablecoin.test.ts.snap
diff --git a/packages/core/src/stablecoin.ts → packages/core/solidity/src/stablecoin.ts b/packages/core/src/stablecoin.ts → packages/core/solidity/src/stablecoin.ts
diff --git a/packages/core/src/test.ts → packages/core/solidity/src/test.ts b/packages/core/src/test.ts → packages/core/solidity/src/test.ts
diff --git a/packages/core/src/utils/define-functions.ts → ...re/solidity/src/utils/define-functions.ts b/packages/core/src/utils/define-functions.ts → ...re/solidity/src/utils/define-functions.ts
diff --git a/packages/core/src/utils/duration.ts → packages/core/solidity/src/utils/duration.ts b/packages/core/src/utils/duration.ts → packages/core/solidity/src/utils/duration.ts
diff --git a/packages/core/src/utils/find-cover.ts → ...ges/core/solidity/src/utils/find-cover.ts b/packages/core/src/utils/find-cover.ts → ...ges/core/solidity/src/utils/find-cover.ts
diff --git a/packages/core/src/utils/format-lines.ts → ...s/core/solidity/src/utils/format-lines.ts b/packages/core/src/utils/format-lines.ts → ...s/core/solidity/src/utils/format-lines.ts
diff --git a/packages/core/src/utils/map-values.ts → ...ges/core/solidity/src/utils/map-values.ts b/packages/core/src/utils/map-values.ts → ...ges/core/solidity/src/utils/map-values.ts
diff --git a/packages/core/src/utils/sorted-by.ts → ...ages/core/solidity/src/utils/sorted-by.ts b/packages/core/src/utils/sorted-by.ts → ...ages/core/solidity/src/utils/sorted-by.ts
diff --git a/...ages/core/src/utils/to-identifier.test.ts → .../solidity/src/utils/to-identifier.test.ts b/...ages/core/src/utils/to-identifier.test.ts → .../solidity/src/utils/to-identifier.test.ts
diff --git a/packages/core/src/utils/to-identifier.ts → .../core/solidity/src/utils/to-identifier.ts b/packages/core/src/utils/to-identifier.ts → .../core/solidity/src/utils/to-identifier.ts
diff --git a/...ages/core/src/utils/transitive-closure.ts → .../solidity/src/utils/transitive-closure.ts b/...ages/core/src/utils/transitive-closure.ts → .../solidity/src/utils/transitive-closure.ts
diff --git a/packages/core/src/utils/version.test.ts → ...s/core/solidity/src/utils/version.test.ts b/packages/core/src/utils/version.test.ts → ...s/core/solidity/src/utils/version.test.ts
diff --git a/packages/core/src/utils/version.ts → packages/core/solidity/src/utils/version.ts b/packages/core/src/utils/version.ts → packages/core/solidity/src/utils/version.ts
diff --git a/packages/core/src/zip-foundry.test.ts → ...ges/core/solidity/src/zip-foundry.test.ts b/packages/core/src/zip-foundry.test.ts → ...ges/core/solidity/src/zip-foundry.test.ts
diff --git a/packages/core/src/zip-foundry.test.ts.md → .../core/solidity/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md → .../core/solidity/src/zip-foundry.test.ts.md
diff --git a/packages/core/src/zip-foundry.test.ts.snap → ...ore/solidity/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap → ...ore/solidity/src/zip-foundry.test.ts.snap
diff --git a/packages/core/src/zip-foundry.ts → packages/core/solidity/src/zip-foundry.ts b/packages/core/src/zip-foundry.ts → packages/core/solidity/src/zip-foundry.ts
diff --git a/packages/core/src/zip-hardhat.test.ts → ...ges/core/solidity/src/zip-hardhat.test.ts b/packages/core/src/zip-hardhat.test.ts → ...ges/core/solidity/src/zip-hardhat.test.ts
diff --git a/packages/core/src/zip-hardhat.test.ts.md → .../core/solidity/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md → .../core/solidity/src/zip-hardhat.test.ts.md
diff --git a/packages/core/src/zip-hardhat.test.ts.snap → ...ore/solidity/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap → ...ore/solidity/src/zip-hardhat.test.ts.snap
diff --git a/packages/core/src/zip-hardhat.ts → packages/core/solidity/src/zip-hardhat.ts b/packages/core/src/zip-hardhat.ts → packages/core/solidity/src/zip-hardhat.ts
diff --git a/packages/core/tsconfig.json → packages/core/solidity/tsconfig.json b/packages/core/tsconfig.json → 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 → packages/core/solidity/zip-env-foundry.js b/packages/core/zip-env-foundry.js → packages/core/solidity/zip-env-foundry.js
diff --git a/packages/core/zip-env-foundry.ts → packages/core/solidity/zip-env-foundry.ts b/packages/core/zip-env-foundry.ts → packages/core/solidity/zip-env-foundry.ts
diff --git a/packages/core/zip-env-hardhat.js → packages/core/solidity/zip-env-hardhat.js b/packages/core/zip-env-hardhat.js → packages/core/solidity/zip-env-hardhat.js
diff --git a/packages/core/zip-env-hardhat.ts → packages/core/solidity/zip-env-hardhat.ts b/packages/core/zip-env-hardhat.ts → packages/core/solidity/zip-env-hardhat.ts
diff --git a/packages/ui/api/ai.ts b/packages/ui/api/ai.ts
@@ -1,6 +1,6 @@
 import OpenAI from 'https://esm.sh/[email protected]'
 import { OpenAIStream, StreamingTextResponse } from 'https://esm.sh/[email protected]'
-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/[email protected]'
 
 export default async (req: Request) => {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,13 @@
 <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';
 
   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
@@ -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
@@ -1,13 +1,13 @@
 <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';
 
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → packages/ui/src/common/Dropdown.svelte b/packages/ui/src/Dropdown.svelte → packages/ui/src/common/Dropdown.svelte
diff --git a/packages/ui/src/HelpTooltip.svelte → packages/ui/src/common/HelpTooltip.svelte b/packages/ui/src/HelpTooltip.svelte → packages/ui/src/common/HelpTooltip.svelte
diff --git a/packages/ui/src/OverflowMenu.svelte → packages/ui/src/common/OverflowMenu.svelte b/packages/ui/src/OverflowMenu.svelte → packages/ui/src/common/OverflowMenu.svelte
diff --git a/packages/ui/src/Tooltip.svelte → packages/ui/src/common/Tooltip.svelte b/packages/ui/src/Tooltip.svelte → packages/ui/src/common/Tooltip.svelte
diff --git a/packages/ui/src/UnsupportedVersion.svelte → ...s/ui/src/common/UnsupportedVersion.svelte b/packages/ui/src/UnsupportedVersion.svelte → ...s/ui/src/common/UnsupportedVersion.svelte
diff --git a/packages/ui/src/error-tooltip.ts → packages/ui/src/common/error-tooltip.ts b/packages/ui/src/error-tooltip.ts → packages/ui/src/common/error-tooltip.ts
diff --git a/packages/ui/src/icons/ArrowsLeft.svelte → ...ges/ui/src/common/icons/ArrowsLeft.svelte b/packages/ui/src/icons/ArrowsLeft.svelte → ...ges/ui/src/common/icons/ArrowsLeft.svelte
diff --git a/packages/ui/src/icons/ArrowsRight.svelte → ...es/ui/src/common/icons/ArrowsRight.svelte b/packages/ui/src/icons/ArrowsRight.svelte → ...es/ui/src/common/icons/ArrowsRight.svelte
diff --git a/packages/ui/src/icons/CheckIcon.svelte → ...ages/ui/src/common/icons/CheckIcon.svelte b/packages/ui/src/icons/CheckIcon.svelte → ...ages/ui/src/common/icons/CheckIcon.svelte
diff --git a/packages/ui/src/icons/CopyIcon.svelte → packages/ui/src/common/icons/CopyIcon.svelte b/packages/ui/src/icons/CopyIcon.svelte → packages/ui/src/common/icons/CopyIcon.svelte
diff --git a/packages/ui/src/icons/DocsIcon.svelte → packages/ui/src/common/icons/DocsIcon.svelte b/packages/ui/src/icons/DocsIcon.svelte → packages/ui/src/common/icons/DocsIcon.svelte
diff --git a/packages/ui/src/icons/DownloadIcon.svelte → ...s/ui/src/common/icons/DownloadIcon.svelte b/packages/ui/src/icons/DownloadIcon.svelte → ...s/ui/src/common/icons/DownloadIcon.svelte
diff --git a/packages/ui/src/icons/FileIcon.svelte → packages/ui/src/common/icons/FileIcon.svelte b/packages/ui/src/icons/FileIcon.svelte → packages/ui/src/common/icons/FileIcon.svelte
diff --git a/packages/ui/src/icons/ForumIcon.svelte → ...ages/ui/src/common/icons/ForumIcon.svelte b/packages/ui/src/icons/ForumIcon.svelte → ...ages/ui/src/common/icons/ForumIcon.svelte
diff --git a/packages/ui/src/icons/LICENSE → packages/ui/src/common/icons/LICENSE b/packages/ui/src/icons/LICENSE → packages/ui/src/common/icons/LICENSE
diff --git a/packages/ui/src/icons/MaximizeIcon.svelte → ...s/ui/src/common/icons/MaximizeIcon.svelte b/packages/ui/src/icons/MaximizeIcon.svelte → ...s/ui/src/common/icons/MaximizeIcon.svelte
diff --git a/packages/ui/src/icons/MenuDownIcon.svelte → ...s/ui/src/common/icons/MenuDownIcon.svelte b/packages/ui/src/icons/MenuDownIcon.svelte → ...s/ui/src/common/icons/MenuDownIcon.svelte
diff --git a/packages/ui/src/icons/MinimizeIcon.svelte → ...s/ui/src/common/icons/MinimizeIcon.svelte b/packages/ui/src/icons/MinimizeIcon.svelte → ...s/ui/src/common/icons/MinimizeIcon.svelte
diff --git a/packages/ui/src/icons/OzIcon.svelte → packages/ui/src/common/icons/OzIcon.svelte b/packages/ui/src/icons/OzIcon.svelte → packages/ui/src/common/icons/OzIcon.svelte
diff --git a/packages/ui/src/icons/RemixIcon.svelte → ...ages/ui/src/common/icons/RemixIcon.svelte b/packages/ui/src/icons/RemixIcon.svelte → ...ages/ui/src/common/icons/RemixIcon.svelte
diff --git a/packages/ui/src/icons/UserAvatar.svelte → ...ges/ui/src/common/icons/UserAvatar.svelte b/packages/ui/src/icons/UserAvatar.svelte → ...ges/ui/src/common/icons/UserAvatar.svelte
diff --git a/packages/ui/src/icons/WizAvatar.svelte → ...ages/ui/src/common/icons/WizAvatar.svelte b/packages/ui/src/icons/WizAvatar.svelte → ...ages/ui/src/common/icons/WizAvatar.svelte
diff --git a/packages/ui/src/icons/WizIcon.svelte → packages/ui/src/common/icons/WizIcon.svelte b/packages/ui/src/icons/WizIcon.svelte → packages/ui/src/common/icons/WizIcon.svelte
diff --git a/packages/ui/src/icons/XIcon.svelte → packages/ui/src/common/icons/XIcon.svelte b/packages/ui/src/icons/XIcon.svelte → packages/ui/src/common/icons/XIcon.svelte
diff --git a/packages/ui/src/icons/ZipIcon.svelte → packages/ui/src/common/icons/ZipIcon.svelte b/packages/ui/src/icons/ZipIcon.svelte → packages/ui/src/common/icons/ZipIcon.svelte
diff --git a/packages/ui/src/initial-options.ts → packages/ui/src/common/initial-options.ts b/packages/ui/src/initial-options.ts → packages/ui/src/common/initial-options.ts
diff --git a/packages/ui/src/inputs/ToggleRadio.svelte → ...s/ui/src/common/inputs/ToggleRadio.svelte b/packages/ui/src/inputs/ToggleRadio.svelte → ...s/ui/src/common/inputs/ToggleRadio.svelte
diff --git a/packages/ui/src/post-config.ts → packages/ui/src/common/post-config.ts b/packages/ui/src/post-config.ts → packages/ui/src/common/post-config.ts
diff --git a/packages/ui/src/post-message.ts → packages/ui/src/common/post-message.ts b/packages/ui/src/post-message.ts → packages/ui/src/common/post-message.ts
diff --git a/packages/ui/src/resize-to-fit.ts → packages/ui/src/common/resize-to-fit.ts b/packages/ui/src/resize-to-fit.ts → packages/ui/src/common/resize-to-fit.ts
diff --git a/packages/ui/src/styles/global.css → packages/ui/src/common/styles/global.css b/packages/ui/src/styles/global.css → packages/ui/src/common/styles/global.css
diff --git a/packages/ui/src/styles/reset.css → packages/ui/src/common/styles/reset.css b/packages/ui/src/styles/reset.css → packages/ui/src/common/styles/reset.css
diff --git a/packages/ui/src/styles/tippy.css → packages/ui/src/common/styles/tippy.css b/packages/ui/src/styles/tippy.css → packages/ui/src/common/styles/tippy.css
diff --git a/packages/ui/src/styles/utilities.css → packages/ui/src/common/styles/utilities.css b/packages/ui/src/styles/utilities.css → packages/ui/src/common/styles/utilities.css
diff --git a/packages/ui/src/styles/vars.css → packages/ui/src/common/styles/vars.css b/packages/ui/src/styles/vars.css → packages/ui/src/common/styles/vars.css
diff --git 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
@@ -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 → .../src/solidity/AccessControlSection.svelte b/packages/ui/src/AccessControlSection.svelte → .../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 → packages/ui/src/solidity/App.svelte b/packages/ui/src/App.svelte → 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 → ...ges/ui/src/solidity/CustomControls.svelte b/packages/ui/src/CustomControls.svelte → ...ges/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 → ...i/src/solidity/DefenderDeployModal.svelte b/packages/ui/src/DefenderDeployModal.svelte → ...i/src/solidity/DefenderDeployModal.svelte
diff --git a/packages/ui/src/ERC1155Controls.svelte → ...es/ui/src/solidity/ERC1155Controls.svelte b/packages/ui/src/ERC1155Controls.svelte → ...es/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 → ...ages/ui/src/solidity/ERC20Controls.svelte b/packages/ui/src/ERC20Controls.svelte → ...ages/ui/src/solidity/ERC20Controls.svelte
@@ -1,13 +1,13 @@
 <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';
 
   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',