chore: update remmapings

lukso-network · Feb 13, 2024 · c741da3 · c741da3
1 parent f62b538
commit c741da3
Show file tree

Hide file tree

Showing 275 changed files with 13 additions and 138 deletions.
diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -79,52 +79,12 @@ jobs:
             solc $(ls contracts/**/*.sol | grep -v "Extension4337\|contracts/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset") \
               --allow-paths $(pwd)/node_modules/,$(pwd)/packages/ \
               ../=$(pwd)/contracts/ \
+              @=packages/@ \
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
-              @lukso/lsp0-contracts/=packages/LSP0ERC725Account/ \
-              @lukso/lsp1-contracts/=packages/LSP1UniversalReceiver/ \
-              @lukso/lsp1delegate-contracts/=packages/LSP1UniversalReceiverDelegate/ \
-              @lukso/lsp2-contracts/=packages/LSP2ERC725YJSONSchema/ \
-              @lukso/lsp3-contracts/=packages/LSP3ProfileMetadata/ \
-              @lukso/lsp4-contracts/=packages/LSP4DigitalAssetMetadata/ \
-              @lukso/lsp5-contracts/=packages/LSP5ReceivedAssets/ \
-              @lukso/lsp6-contracts/=packages/LSP6KeyManager/ \
-              @lukso/lsp7-contracts/=packages/LSP7DigitalAsset/ \
-              @lukso/lsp8-contracts/=packages/LSP8IdentifiableDigitalAsset/ \
-              @lukso/lsp9-contracts/=packages/LSP9Vault/ \
-              @lukso/lsp10-contracts/=packages/LSP10ReceivedVaults/ \
-              @lukso/lsp12-contracts/=packages/LSP12IssuedAssets/ \
-              @lukso/lsp14-contracts/=packages/LSP14Ownable2Step/ \
-              @lukso/lsp16-contracts/=packages/LSP16UniversalFactory/ \
-              @lukso/lsp17-contracts/=packages/LSP17Extensions/ \
-              @lukso/lsp17contractextension-contracts/=packages/LSP17ContractExtension/ \
-              @lukso/lsp20-contracts/=packages/LSP20CallVerification/ \
-              @lukso/lsp23-contracts/=packages/LSP23LinkedContractsDeployment/ \
-              @lukso/lsp25-contracts/=packages/LSP25ExecuteRelayCall/ \
-              @lukso/universalprofile-contracts/=packages/UniversalProfile/
           else
             solc contracts/**/*.sol \
+              @=packages/@ \
               @=node_modules/@ \
-              solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
-              @lukso/lsp0-contracts/=packages/LSP0ERC725Account/ \
-              @lukso/lsp1-contracts/=packages/LSP1UniversalReceiver/ \
-              @lukso/lsp1delegate-contracts/=packages/LSP1UniversalReceiverDelegate/ \
-              @lukso/lsp2-contracts/=packages/LSP2ERC725YJSONSchema/ \
-              @lukso/lsp3-contracts/=packages/LSP3ProfileMetadata/ \
-              @lukso/lsp4-contracts/=packages/LSP4DigitalAssetMetadata/ \
-              @lukso/lsp5-contracts/=packages/LSP5ReceivedAssets/ \
-              @lukso/lsp6-contracts/=packages/LSP6KeyManager/ \
-              @lukso/lsp7-contracts/=packages/LSP7DigitalAsset/ \
-              @lukso/lsp8-contracts/=packages/LSP8IdentifiableDigitalAsset/ \
-              @lukso/lsp9-contracts/=packages/LSP9Vault/ \
-              @lukso/lsp10-contracts/=packages/LSP10ReceivedVaults/ \
-              @lukso/lsp12-contracts/=packages/LSP12IssuedAssets/ \
-              @lukso/lsp14-contracts/=packages/LSP14Ownable2Step/ \
-              @lukso/lsp16-contracts/=packages/LSP16UniversalFactory/ \
-              @lukso/lsp17-contracts/=packages/LSP17Extensions/ \
-              @lukso/lsp17contractextension-contracts/=packages/LSP17ContractExtension/ \
-              @lukso/lsp20-contracts/=packages/LSP20CallVerification/ \
-              @lukso/lsp23-contracts/=packages/LSP23LinkedContractsDeployment/ \
-              @lukso/lsp25-contracts/=packages/LSP25ExecuteRelayCall/ \
-              @lukso/universalprofile-contracts/=packages/UniversalProfile/
+              solidity-bytes-utils/=node_modules/solidity-bytes-utils/
           fi;
diff --git a/.mythx.yml b/.mythx.yml
diff --git a/dodoc/config.ts b/dodoc/config.ts
@@ -18,8 +18,8 @@ export const dodocConfig = {
     '@lukso/lsp17-contracts/Extension4337.sol',
     '@lukso/lsp17-contracts/OnERC721ReceivedExtension.sol',
     '@lukso/lsp20-contracts/contracts/LSP20CallVerification.sol',
-    'contracts/LSP23LinkedContractsFactory/LSP23LinkedContractsFactory.sol',
-    'contracts/LSP23LinkedContractsFactory/IPostDeploymentModule.sol',
+    '@lukso/lsp23-contracts/contracts/LSP23LinkedContractsFactory.sol',
+    '@lukso/lsp23-contracts/contracts/IPostDeploymentModule.sol',
     '@lukso/lsp25-contracts/contracts/LSP25MultiChannelNonce.sol',
 
     // tokens

diff --git a/packages/LSP0ERC725Account/.eslintrc.js → packages/@lukso/lsp0-contracts/.eslintrc.js b/packages/LSP0ERC725Account/.eslintrc.js → packages/@lukso/lsp0-contracts/.eslintrc.js
diff --git a/packages/LSP0ERC725Account/.solhint.json → packages/@lukso/lsp0-contracts/.solhint.json b/packages/LSP0ERC725Account/.solhint.json → packages/@lukso/lsp0-contracts/.solhint.json
diff --git a/packages/LSP0ERC725Account/README.md → packages/@lukso/lsp0-contracts/README.md b/packages/LSP0ERC725Account/README.md → packages/@lukso/lsp0-contracts/README.md
diff --git a/...5Account/contracts/ILSP0ERC725Account.sol → ...ontracts/contracts/ILSP0ERC725Account.sol b/...5Account/contracts/ILSP0ERC725Account.sol → ...ontracts/contracts/ILSP0ERC725Account.sol
diff --git a/...ERC725Account/contracts/LSP0Constants.sol → ...sp0-contracts/contracts/LSP0Constants.sol b/...ERC725Account/contracts/LSP0Constants.sol → ...sp0-contracts/contracts/LSP0Constants.sol
diff --git a/...25Account/contracts/LSP0ERC725Account.sol → ...contracts/contracts/LSP0ERC725Account.sol b/...25Account/contracts/LSP0ERC725Account.sol → ...contracts/contracts/LSP0ERC725Account.sol
diff --git a/...count/contracts/LSP0ERC725AccountCore.sol → ...racts/contracts/LSP0ERC725AccountCore.sol b/...count/contracts/LSP0ERC725AccountCore.sol → ...racts/contracts/LSP0ERC725AccountCore.sol
diff --git a/...count/contracts/LSP0ERC725AccountInit.sol → ...racts/contracts/LSP0ERC725AccountInit.sol b/...count/contracts/LSP0ERC725AccountInit.sol → ...racts/contracts/LSP0ERC725AccountInit.sol
diff --git a/...ntracts/LSP0ERC725AccountInitAbstract.sol → ...ntracts/LSP0ERC725AccountInitAbstract.sol b/...ntracts/LSP0ERC725AccountInitAbstract.sol → ...ntracts/LSP0ERC725AccountInitAbstract.sol
diff --git a/...s/LSP0ERC725Account/contracts/Version.sol → ...ukso/lsp0-contracts/contracts/Version.sol b/...s/LSP0ERC725Account/contracts/Version.sol → ...ukso/lsp0-contracts/contracts/Version.sol
diff --git a/packages/LSP0ERC725Account/hardhat.config.ts → ...s/@lukso/lsp0-contracts/hardhat.config.ts b/packages/LSP0ERC725Account/hardhat.config.ts → ...s/@lukso/lsp0-contracts/hardhat.config.ts
diff --git a/packages/LSP0ERC725Account/package.json → packages/@lukso/lsp0-contracts/package.json b/packages/LSP0ERC725Account/package.json → packages/@lukso/lsp0-contracts/package.json
diff --git a/packages/LSP0ERC725Account/tsconfig.json → packages/@lukso/lsp0-contracts/tsconfig.json b/packages/LSP0ERC725Account/tsconfig.json → packages/@lukso/lsp0-contracts/tsconfig.json
diff --git a/packages/LSP10ReceivedVaults/.eslintrc.js → packages/@lukso/lsp1-contracts/.eslintrc.js b/packages/LSP10ReceivedVaults/.eslintrc.js → packages/@lukso/lsp1-contracts/.eslintrc.js
diff --git a/packages/LSP10ReceivedVaults/.solhint.json → packages/@lukso/lsp1-contracts/.solhint.json b/packages/LSP10ReceivedVaults/.solhint.json → packages/@lukso/lsp1-contracts/.solhint.json
diff --git a/packages/LSP10ReceivedVaults/README.md → packages/@lukso/lsp1-contracts/README.md b/packages/LSP10ReceivedVaults/README.md → packages/@lukso/lsp1-contracts/README.md
diff --git a/...iver/contracts/ILSP1UniversalReceiver.sol → ...acts/contracts/ILSP1UniversalReceiver.sol b/...iver/contracts/ILSP1UniversalReceiver.sol → ...acts/contracts/ILSP1UniversalReceiver.sol
diff --git a/...tracts/ILSP1UniversalReceiverDelegate.sol → ...tracts/ILSP1UniversalReceiverDelegate.sol b/...tracts/ILSP1UniversalReceiverDelegate.sol → ...tracts/ILSP1UniversalReceiverDelegate.sol
diff --git a/...ersalReceiver/contracts/LSP1Constants.sol → ...sp1-contracts/contracts/LSP1Constants.sol b/...ersalReceiver/contracts/LSP1Constants.sol → ...sp1-contracts/contracts/LSP1Constants.sol
diff --git a/...UniversalReceiver/contracts/LSP1Utils.sol → ...so/lsp1-contracts/contracts/LSP1Utils.sol b/...UniversalReceiver/contracts/LSP1Utils.sol → ...so/lsp1-contracts/contracts/LSP1Utils.sol
diff --git a/...ges/LSP10ReceivedVaults/hardhat.config.ts → ...s/@lukso/lsp1-contracts/hardhat.config.ts b/...ges/LSP10ReceivedVaults/hardhat.config.ts → ...s/@lukso/lsp1-contracts/hardhat.config.ts
diff --git a/packages/LSP1UniversalReceiver/package.json → packages/@lukso/lsp1-contracts/package.json b/packages/LSP1UniversalReceiver/package.json → packages/@lukso/lsp1-contracts/package.json
diff --git a/packages/LSP10ReceivedVaults/tsconfig.json → packages/@lukso/lsp1-contracts/tsconfig.json b/packages/LSP10ReceivedVaults/tsconfig.json → packages/@lukso/lsp1-contracts/tsconfig.json
diff --git a/packages/LSP12IssuedAssets/.eslintrc.js → packages/@lukso/lsp10-contracts/.eslintrc.js b/packages/LSP12IssuedAssets/.eslintrc.js → packages/@lukso/lsp10-contracts/.eslintrc.js
diff --git a/packages/LSP12IssuedAssets/.solhint.json → ...ages/@lukso/lsp10-contracts/.solhint.json b/packages/LSP12IssuedAssets/.solhint.json → ...ages/@lukso/lsp10-contracts/.solhint.json
diff --git a/packages/LSP1UniversalReceiver/README.md → packages/@lukso/lsp10-contracts/README.md b/packages/LSP1UniversalReceiver/README.md → packages/@lukso/lsp10-contracts/README.md
diff --git a/...ceivedVaults/contracts/LSP10Constants.sol → ...10-contracts/contracts/LSP10Constants.sol b/...ceivedVaults/contracts/LSP10Constants.sol → ...10-contracts/contracts/LSP10Constants.sol
diff --git a/...10ReceivedVaults/contracts/LSP10Utils.sol → .../lsp10-contracts/contracts/LSP10Utils.sol b/...10ReceivedVaults/contracts/LSP10Utils.sol → .../lsp10-contracts/contracts/LSP10Utils.sol
diff --git a/packages/LSP12IssuedAssets/hardhat.config.ts → .../@lukso/lsp10-contracts/hardhat.config.ts b/packages/LSP12IssuedAssets/hardhat.config.ts → .../@lukso/lsp10-contracts/hardhat.config.ts
diff --git a/packages/LSP10ReceivedVaults/package.json → packages/@lukso/lsp10-contracts/package.json b/packages/LSP10ReceivedVaults/package.json → packages/@lukso/lsp10-contracts/package.json
diff --git a/packages/LSP12IssuedAssets/tsconfig.json → ...ages/@lukso/lsp10-contracts/tsconfig.json b/packages/LSP12IssuedAssets/tsconfig.json → ...ages/@lukso/lsp10-contracts/tsconfig.json
diff --git a/packages/LSP14Ownable2Step/.eslintrc.js → packages/@lukso/lsp12-contracts/.eslintrc.js b/packages/LSP14Ownable2Step/.eslintrc.js → packages/@lukso/lsp12-contracts/.eslintrc.js
diff --git a/packages/LSP14Ownable2Step/.solhint.json → ...ages/@lukso/lsp12-contracts/.solhint.json b/packages/LSP14Ownable2Step/.solhint.json → ...ages/@lukso/lsp12-contracts/.solhint.json
diff --git a/packages/LSP12IssuedAssets/README.md → packages/@lukso/lsp12-contracts/README.md b/packages/LSP12IssuedAssets/README.md → packages/@lukso/lsp12-contracts/README.md
diff --git a/...IssuedAssets/contracts/LSP12Constants.sol → ...12-contracts/contracts/LSP12Constants.sol b/...IssuedAssets/contracts/LSP12Constants.sol → ...12-contracts/contracts/LSP12Constants.sol
diff --git a/.../LSP17ContractExtension/hardhat.config.ts → .../@lukso/lsp12-contracts/hardhat.config.ts b/.../LSP17ContractExtension/hardhat.config.ts → .../@lukso/lsp12-contracts/hardhat.config.ts
diff --git a/packages/LSP12IssuedAssets/package.json → packages/@lukso/lsp12-contracts/package.json b/packages/LSP12IssuedAssets/package.json → packages/@lukso/lsp12-contracts/package.json
diff --git a/packages/LSP14Ownable2Step/tsconfig.json → ...ages/@lukso/lsp12-contracts/tsconfig.json b/packages/LSP14Ownable2Step/tsconfig.json → ...ages/@lukso/lsp12-contracts/tsconfig.json
diff --git a/packages/LSP16UniversalFactory/.eslintrc.js → packages/@lukso/lsp14-contracts/.eslintrc.js b/packages/LSP16UniversalFactory/.eslintrc.js → packages/@lukso/lsp14-contracts/.eslintrc.js
diff --git a/packages/LSP16UniversalFactory/.solhint.json → ...ages/@lukso/lsp14-contracts/.solhint.json b/packages/LSP16UniversalFactory/.solhint.json → ...ages/@lukso/lsp14-contracts/.solhint.json
diff --git a/packages/LSP14Ownable2Step/README.md → packages/@lukso/lsp14-contracts/README.md b/packages/LSP14Ownable2Step/README.md → packages/@lukso/lsp14-contracts/README.md
diff --git a/...ble2Step/contracts/ILSP14Ownable2Step.sol → ...ontracts/contracts/ILSP14Ownable2Step.sol b/...ble2Step/contracts/ILSP14Ownable2Step.sol → ...ontracts/contracts/ILSP14Ownable2Step.sol
diff --git a/...Ownable2Step/contracts/LSP14Constants.sol → ...14-contracts/contracts/LSP14Constants.sol b/...Ownable2Step/contracts/LSP14Constants.sol → ...14-contracts/contracts/LSP14Constants.sol
diff --git a/...P14Ownable2Step/contracts/LSP14Errors.sol → ...lsp14-contracts/contracts/LSP14Errors.sol b/...P14Ownable2Step/contracts/LSP14Errors.sol → ...lsp14-contracts/contracts/LSP14Errors.sol
diff --git a/...able2Step/contracts/LSP14Ownable2Step.sol → ...contracts/contracts/LSP14Ownable2Step.sol b/...able2Step/contracts/LSP14Ownable2Step.sol → ...contracts/contracts/LSP14Ownable2Step.sol
diff --git a/packages/LSP14Ownable2Step/hardhat.config.ts → .../@lukso/lsp14-contracts/hardhat.config.ts b/packages/LSP14Ownable2Step/hardhat.config.ts → .../@lukso/lsp14-contracts/hardhat.config.ts
diff --git a/packages/LSP14Ownable2Step/package.json → packages/@lukso/lsp14-contracts/package.json b/packages/LSP14Ownable2Step/package.json → packages/@lukso/lsp14-contracts/package.json
diff --git a/packages/LSP16UniversalFactory/tsconfig.json → ...ages/@lukso/lsp14-contracts/tsconfig.json b/packages/LSP16UniversalFactory/tsconfig.json → ...ages/@lukso/lsp14-contracts/tsconfig.json
diff --git a/packages/LSP17ContractExtension/.eslintrc.js → packages/@lukso/lsp16-contracts/.eslintrc.js b/packages/LSP17ContractExtension/.eslintrc.js → packages/@lukso/lsp16-contracts/.eslintrc.js
diff --git a/...ages/LSP17ContractExtension/.solhint.json → ...ages/@lukso/lsp16-contracts/.solhint.json b/...ages/LSP17ContractExtension/.solhint.json → ...ages/@lukso/lsp16-contracts/.solhint.json
diff --git a/packages/LSP16UniversalFactory/README.md → packages/@lukso/lsp16-contracts/README.md b/packages/LSP16UniversalFactory/README.md → packages/@lukso/lsp16-contracts/README.md
diff --git a/...ctory/contracts/LSP16UniversalFactory.sol → ...racts/contracts/LSP16UniversalFactory.sol b/...ctory/contracts/LSP16UniversalFactory.sol → ...racts/contracts/LSP16UniversalFactory.sol
diff --git a/...iversalFactory/contracts/Mock/Account.sol → ...sp16-contracts/contracts/Mock/Account.sol b/...iversalFactory/contracts/Mock/Account.sol → ...sp16-contracts/contracts/Mock/Account.sol
diff --git a/...salFactory/contracts/Mock/AccountInit.sol → ...-contracts/contracts/Mock/AccountInit.sol b/...salFactory/contracts/Mock/AccountInit.sol → ...-contracts/contracts/Mock/AccountInit.sol
diff --git a/.../contracts/Mock/ContractNoConstructor.sol → .../contracts/Mock/ContractNoConstructor.sol b/.../contracts/Mock/ContractNoConstructor.sol → .../contracts/Mock/ContractNoConstructor.sol
diff --git a/...ry/contracts/Mock/FallbackInitializer.sol → ...ts/contracts/Mock/FallbackInitializer.sol b/...ry/contracts/Mock/FallbackInitializer.sol → ...ts/contracts/Mock/FallbackInitializer.sol
diff --git a/...y/contracts/Mock/ImplementationTester.sol → ...s/contracts/Mock/ImplementationTester.sol b/...y/contracts/Mock/ImplementationTester.sol → ...s/contracts/Mock/ImplementationTester.sol
diff --git a/...ory/contracts/Mock/NonPayableContract.sol → ...cts/contracts/Mock/NonPayableContract.sol b/...ory/contracts/Mock/NonPayableContract.sol → ...cts/contracts/Mock/NonPayableContract.sol
diff --git a/...ory/contracts/Mock/NonPayableFallback.sol → ...cts/contracts/Mock/NonPayableFallback.sol b/...ory/contracts/Mock/NonPayableFallback.sol → ...cts/contracts/Mock/NonPayableFallback.sol
diff --git a/...actory/contracts/Mock/PayableContract.sol → ...tracts/contracts/Mock/PayableContract.sol b/...actory/contracts/Mock/PayableContract.sol → ...tracts/contracts/Mock/PayableContract.sol
diff --git a/...LSP16UniversalFactory/contracts/README.md → ...lukso/lsp16-contracts/contracts/README.md b/...LSP16UniversalFactory/contracts/README.md → ...lukso/lsp16-contracts/contracts/README.md
diff --git a/...ctory/foundry/LSP16UniversalFactory.t.sol → ...racts/foundry/LSP16UniversalFactory.t.sol b/...ctory/foundry/LSP16UniversalFactory.t.sol → ...racts/foundry/LSP16UniversalFactory.t.sol
diff --git a/...s/LSP16UniversalFactory/hardhat.config.ts → .../@lukso/lsp16-contracts/hardhat.config.ts b/...s/LSP16UniversalFactory/hardhat.config.ts → .../@lukso/lsp16-contracts/hardhat.config.ts
diff --git a/packages/LSP16UniversalFactory/package.json → packages/@lukso/lsp16-contracts/package.json b/packages/LSP16UniversalFactory/package.json → packages/@lukso/lsp16-contracts/package.json
diff --git a/...ctory/tests/LSP16UniversalFactory.test.ts → ...racts/tests/LSP16UniversalFactory.test.ts b/...ctory/tests/LSP16UniversalFactory.test.ts → ...racts/tests/LSP16UniversalFactory.test.ts
@@ -24,7 +24,7 @@ import web3 from 'web3';
 
 import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
-import { provider, AddressOffset } from '../../../tests/utils/helpers';
+import { provider, AddressOffset } from '../../../../tests/utils/helpers';
 
 const AccountBytecode = Account__factory.bytecode;
 const NonPayableConstructorBytecode = NonPayableContract__factory.bytecode;

diff --git a/...ages/LSP17ContractExtension/tsconfig.json → ...ages/@lukso/lsp16-contracts/tsconfig.json b/...ages/LSP17ContractExtension/tsconfig.json → ...ages/@lukso/lsp16-contracts/tsconfig.json
diff --git a/packages/LSP17Extensions/.eslintrc.js → packages/@lukso/lsp17-contracts/.eslintrc.js b/packages/LSP17Extensions/.eslintrc.js → packages/@lukso/lsp17-contracts/.eslintrc.js
diff --git a/packages/LSP17Extensions/.solhint.json → ...ages/@lukso/lsp17-contracts/.solhint.json b/packages/LSP17Extensions/.solhint.json → ...ages/@lukso/lsp17-contracts/.solhint.json
diff --git a/packages/LSP17Extensions/README.md → packages/@lukso/lsp17-contracts/README.md b/packages/LSP17Extensions/README.md → packages/@lukso/lsp17-contracts/README.md
diff --git a/...P17Extensions/contracts/Extension4337.sol → ...p17-contracts/contracts/Extension4337.sol b/...P17Extensions/contracts/Extension4337.sol → ...p17-contracts/contracts/Extension4337.sol
diff --git a/...s/contracts/OnERC721ReceivedExtension.sol → ...s/contracts/OnERC721ReceivedExtension.sol b/...s/contracts/OnERC721ReceivedExtension.sol → ...s/contracts/OnERC721ReceivedExtension.sol
diff --git a/packages/LSP17Extensions/hardhat.config.ts → .../@lukso/lsp17-contracts/hardhat.config.ts b/packages/LSP17Extensions/hardhat.config.ts → .../@lukso/lsp17-contracts/hardhat.config.ts
diff --git a/packages/LSP17Extensions/package.json → packages/@lukso/lsp17-contracts/package.json b/packages/LSP17Extensions/package.json → packages/@lukso/lsp17-contracts/package.json
diff --git a/packages/LSP17Extensions/tsconfig.json → ...ages/@lukso/lsp17-contracts/tsconfig.json b/packages/LSP17Extensions/tsconfig.json → ...ages/@lukso/lsp17-contracts/tsconfig.json
diff --git a/packages/LSP1UniversalReceiver/.eslintrc.js → ...7contractextension-contracts/.eslintrc.js b/packages/LSP1UniversalReceiver/.eslintrc.js → ...7contractextension-contracts/.eslintrc.js
diff --git a/packages/LSP17ContractExtension/.gitmodules → ...17contractextension-contracts/.gitmodules b/packages/LSP17ContractExtension/.gitmodules → ...17contractextension-contracts/.gitmodules
diff --git a/packages/LSP1UniversalReceiver/.solhint.json → ...contractextension-contracts/.solhint.json b/packages/LSP1UniversalReceiver/.solhint.json → ...contractextension-contracts/.solhint.json
diff --git a/packages/LSP17ContractExtension/README.md → ...sp17contractextension-contracts/README.md b/packages/LSP17ContractExtension/README.md → ...sp17contractextension-contracts/README.md
diff --git a/...actExtension/contracts/LSP17Constants.sol → ...on-contracts/contracts/LSP17Constants.sol b/...actExtension/contracts/LSP17Constants.sol → ...on-contracts/contracts/LSP17Constants.sol
diff --git a/...ntractExtension/contracts/LSP17Errors.sol → ...nsion-contracts/contracts/LSP17Errors.sol b/...ntractExtension/contracts/LSP17Errors.sol → ...nsion-contracts/contracts/LSP17Errors.sol
diff --git a/...ctExtension/contracts/LSP17Extendable.sol → ...n-contracts/contracts/LSP17Extendable.sol b/...ctExtension/contracts/LSP17Extendable.sol → ...n-contracts/contracts/LSP17Extendable.sol
diff --git a/...actExtension/contracts/LSP17Extension.sol → ...on-contracts/contracts/LSP17Extension.sol b/...actExtension/contracts/LSP17Extension.sol → ...on-contracts/contracts/LSP17Extension.sol
diff --git a/...ontractExtension/contracts/LSP17Utils.sol → ...ension-contracts/contracts/LSP17Utils.sol b/...ontractExtension/contracts/LSP17Utils.sol → ...ension-contracts/contracts/LSP17Utils.sol
diff --git a/...17ContractExtension/contracts/Version.sol → ...extension-contracts/contracts/Version.sol b/...17ContractExtension/contracts/Version.sol → ...extension-contracts/contracts/Version.sol
diff --git a/packages/LSP17ContractExtension/foundry.toml → ...7contractextension-contracts/foundry.toml b/packages/LSP17ContractExtension/foundry.toml → ...7contractextension-contracts/foundry.toml
diff --git a/...s/LSP1UniversalReceiver/hardhat.config.ts → ...ractextension-contracts/hardhat.config.ts b/...s/LSP1UniversalReceiver/hardhat.config.ts → ...ractextension-contracts/hardhat.config.ts
diff --git a/.../LSP17ContractExtension/package-lock.json → ...ractextension-contracts/package-lock.json b/.../LSP17ContractExtension/package-lock.json → ...ractextension-contracts/package-lock.json
diff --git a/packages/LSP17ContractExtension/package.json → ...7contractextension-contracts/package.json b/packages/LSP17ContractExtension/package.json → ...7contractextension-contracts/package.json
diff --git a/packages/LSP1UniversalReceiver/tsconfig.json → ...contractextension-contracts/tsconfig.json b/packages/LSP1UniversalReceiver/tsconfig.json → ...contractextension-contracts/tsconfig.json
diff --git a/...SP1UniversalReceiverDelegate/.eslintrc.js → ...lukso/lsp1delegate-contracts/.eslintrc.js b/...SP1UniversalReceiverDelegate/.eslintrc.js → ...lukso/lsp1delegate-contracts/.eslintrc.js
diff --git a/...P1UniversalReceiverDelegate/.solhint.json → ...ukso/lsp1delegate-contracts/.solhint.json b/...P1UniversalReceiverDelegate/.solhint.json → ...ukso/lsp1delegate-contracts/.solhint.json
diff --git a/...s/LSP1UniversalReceiverDelegate/README.md → ...s/@lukso/lsp1delegate-contracts/README.md b/...s/LSP1UniversalReceiverDelegate/README.md → ...s/@lukso/lsp1delegate-contracts/README.md
diff --git a/...ReceiverDelegate/contracts/LSP1Errors.sol → ...legate-contracts/contracts/LSP1Errors.sol b/...ReceiverDelegate/contracts/LSP1Errors.sol → ...legate-contracts/contracts/LSP1Errors.sol
diff --git a/...racts/LSP1UniversalReceiverDelegateUP.sol → ...racts/LSP1UniversalReceiverDelegateUP.sol b/...racts/LSP1UniversalReceiverDelegateUP.sol → ...racts/LSP1UniversalReceiverDelegateUP.sol
diff --git a/...ts/LSP1UniversalReceiverDelegateVault.sol → ...ts/LSP1UniversalReceiverDelegateVault.sol b/...ts/LSP1UniversalReceiverDelegateVault.sol → ...ts/LSP1UniversalReceiverDelegateVault.sol
diff --git a/...salReceiverDelegate/contracts/Version.sol → ...1delegate-contracts/contracts/Version.sol b/...salReceiverDelegate/contracts/Version.sol → ...1delegate-contracts/contracts/Version.sol
diff --git a/...iversalReceiverDelegate/hardhat.config.ts → .../lsp1delegate-contracts/hardhat.config.ts b/...iversalReceiverDelegate/hardhat.config.ts → .../lsp1delegate-contracts/hardhat.config.ts
diff --git a/...SP1UniversalReceiverDelegate/package.json → ...lukso/lsp1delegate-contracts/package.json b/...SP1UniversalReceiverDelegate/package.json → ...lukso/lsp1delegate-contracts/package.json
diff --git a/...P1UniversalReceiverDelegate/tsconfig.json → ...ukso/lsp1delegate-contracts/tsconfig.json b/...P1UniversalReceiverDelegate/tsconfig.json → ...ukso/lsp1delegate-contracts/tsconfig.json
diff --git a/packages/LSP20CallVerification/.eslintrc.js → packages/@lukso/lsp2-contracts/.eslintrc.js b/packages/LSP20CallVerification/.eslintrc.js → packages/@lukso/lsp2-contracts/.eslintrc.js
diff --git a/packages/LSP2ERC725YJSONSchema/.gitmodules → packages/@lukso/lsp2-contracts/.gitmodules b/packages/LSP2ERC725YJSONSchema/.gitmodules → packages/@lukso/lsp2-contracts/.gitmodules
diff --git a/packages/LSP20CallVerification/.solhint.json → packages/@lukso/lsp2-contracts/.solhint.json b/packages/LSP20CallVerification/.solhint.json → packages/@lukso/lsp2-contracts/.solhint.json
diff --git a/packages/LSP2ERC725YJSONSchema/README.md → packages/@lukso/lsp2-contracts/README.md b/packages/LSP2ERC725YJSONSchema/README.md → packages/@lukso/lsp2-contracts/README.md
diff --git a/...ERC725YJSONSchema/contracts/LSP2Utils.sol → ...so/lsp2-contracts/contracts/LSP2Utils.sol b/...ERC725YJSONSchema/contracts/LSP2Utils.sol → ...so/lsp2-contracts/contracts/LSP2Utils.sol
diff --git a/...ontracts/Mocks/LSP2UtilsLibraryTester.sol → ...ontracts/Mocks/LSP2UtilsLibraryTester.sol b/...ontracts/Mocks/LSP2UtilsLibraryTester.sol → ...ontracts/Mocks/LSP2UtilsLibraryTester.sol
diff --git a/...ERC725YJSONSchema/foundry/LSP2Utils.t.sol → ...so/lsp2-contracts/foundry/LSP2Utils.t.sol b/...ERC725YJSONSchema/foundry/LSP2Utils.t.sol → ...so/lsp2-contracts/foundry/LSP2Utils.t.sol
diff --git a/...s/LSP20CallVerification/hardhat.config.ts → ...s/@lukso/lsp2-contracts/hardhat.config.ts b/...s/LSP20CallVerification/hardhat.config.ts → ...s/@lukso/lsp2-contracts/hardhat.config.ts
diff --git a/packages/LSP2ERC725YJSONSchema/package.json → packages/@lukso/lsp2-contracts/package.json b/packages/LSP2ERC725YJSONSchema/package.json → packages/@lukso/lsp2-contracts/package.json
diff --git a/...JSONSchema/tests/LSP2UtilsLibrary.test.ts → ...-contracts/tests/LSP2UtilsLibrary.test.ts b/...JSONSchema/tests/LSP2UtilsLibrary.test.ts → ...-contracts/tests/LSP2UtilsLibrary.test.ts
@@ -3,7 +3,7 @@ import { ethers } from 'hardhat';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { LSP2UtilsLibraryTester, LSP2UtilsLibraryTester__factory } from '../types';
 
-import { encodeCompactBytesArray } from '../../../tests/utils/helpers';
+import { encodeCompactBytesArray } from '../../../../tests/utils/helpers';
 
 describe('LSP2Utils', () => {
   let accounts: SignerWithAddress[];

diff --git a/packages/LSP20CallVerification/tsconfig.json → packages/@lukso/lsp2-contracts/tsconfig.json b/packages/LSP20CallVerification/tsconfig.json → packages/@lukso/lsp2-contracts/tsconfig.json
diff --git a/.../LSP23LinkedContractsFactory/.eslintrc.js → packages/@lukso/lsp20-contracts/.eslintrc.js b/.../LSP23LinkedContractsFactory/.eslintrc.js → packages/@lukso/lsp20-contracts/.eslintrc.js
diff --git a/...LSP23LinkedContractsFactory/.solhint.json → ...ages/@lukso/lsp20-contracts/.solhint.json b/...LSP23LinkedContractsFactory/.solhint.json → ...ages/@lukso/lsp20-contracts/.solhint.json
diff --git a/packages/LSP20CallVerification/README.md → packages/@lukso/lsp20-contracts/README.md b/packages/LSP20CallVerification/README.md → packages/@lukso/lsp20-contracts/README.md
diff --git a/...fication/contracts/ILSP20CallVerifier.sol → ...ontracts/contracts/ILSP20CallVerifier.sol b/...fication/contracts/ILSP20CallVerifier.sol → ...ontracts/contracts/ILSP20CallVerifier.sol
diff --git a/...ation/contracts/LSP20CallVerification.sol → ...racts/contracts/LSP20CallVerification.sol b/...ation/contracts/LSP20CallVerification.sol → ...racts/contracts/LSP20CallVerification.sol
diff --git a/...Verification/contracts/LSP20Constants.sol → ...20-contracts/contracts/LSP20Constants.sol b/...Verification/contracts/LSP20Constants.sol → ...20-contracts/contracts/LSP20Constants.sol
diff --git a/...allVerification/contracts/LSP20Errors.sol → ...lsp20-contracts/contracts/LSP20Errors.sol b/...allVerification/contracts/LSP20Errors.sol → ...lsp20-contracts/contracts/LSP20Errors.sol
diff --git a/...3LinkedContractsFactory/hardhat.config.ts → .../@lukso/lsp20-contracts/hardhat.config.ts b/...3LinkedContractsFactory/hardhat.config.ts → .../@lukso/lsp20-contracts/hardhat.config.ts
diff --git a/packages/LSP20CallVerification/package.json → packages/@lukso/lsp20-contracts/package.json b/packages/LSP20CallVerification/package.json → packages/@lukso/lsp20-contracts/package.json
diff --git a/...LSP23LinkedContractsFactory/tsconfig.json → ...ages/@lukso/lsp20-contracts/tsconfig.json b/...LSP23LinkedContractsFactory/tsconfig.json → ...ages/@lukso/lsp20-contracts/tsconfig.json
diff --git a/packages/LSP25ExecuteRelayCall/.eslintrc.js → packages/@lukso/lsp23-contracts/.eslintrc.js b/packages/LSP25ExecuteRelayCall/.eslintrc.js → packages/@lukso/lsp23-contracts/.eslintrc.js
diff --git a/packages/LSP25ExecuteRelayCall/.solhint.json → ...ages/@lukso/lsp23-contracts/.solhint.json b/packages/LSP25ExecuteRelayCall/.solhint.json → ...ages/@lukso/lsp23-contracts/.solhint.json
diff --git a/...ges/LSP23LinkedContractsFactory/README.md → packages/@lukso/lsp23-contracts/README.md b/...ges/LSP23LinkedContractsFactory/README.md → packages/@lukso/lsp23-contracts/README.md
diff --git a/...ontracts/ILSP23LinkedContractsFactory.sol → ...ontracts/ILSP23LinkedContractsFactory.sol b/...ontracts/ILSP23LinkedContractsFactory.sol → ...ontracts/ILSP23LinkedContractsFactory.sol
diff --git a/...ctory/contracts/IPostDeploymentModule.sol → ...racts/contracts/IPostDeploymentModule.sol b/...ctory/contracts/IPostDeploymentModule.sol → ...racts/contracts/IPostDeploymentModule.sol
diff --git a/...ontractsFactory/contracts/LSP23Errors.sol → ...lsp23-contracts/contracts/LSP23Errors.sol b/...ontractsFactory/contracts/LSP23Errors.sol → ...lsp23-contracts/contracts/LSP23Errors.sol
diff --git a/...contracts/LSP23LinkedContractsFactory.sol → ...contracts/LSP23LinkedContractsFactory.sol b/...contracts/LSP23LinkedContractsFactory.sol → ...contracts/LSP23LinkedContractsFactory.sol
diff --git a/...tractsFactory/contracts/modules/README.md → ...p23-contracts/contracts/modules/README.md b/...tractsFactory/contracts/modules/README.md → ...p23-contracts/contracts/modules/README.md
diff --git a/...versalProfileInitPostDeploymentModule.sol → ...versalProfileInitPostDeploymentModule.sol b/...versalProfileInitPostDeploymentModule.sol → ...versalProfileInitPostDeploymentModule.sol
diff --git a/.../UniversalProfilePostDeploymentModule.sol → .../UniversalProfilePostDeploymentModule.sol b/.../UniversalProfilePostDeploymentModule.sol → .../UniversalProfilePostDeploymentModule.sol
diff --git a/...acts/modules/deployment-UP-init-module.md → ...acts/modules/deployment-UP-init-module.md b/...acts/modules/deployment-UP-init-module.md → ...acts/modules/deployment-UP-init-module.md
diff --git a/...contracts/modules/deployment-UP-module.md → ...contracts/modules/deployment-UP-module.md b/...contracts/modules/deployment-UP-module.md → ...contracts/modules/deployment-UP-module.md
diff --git a/...s/LSP25ExecuteRelayCall/hardhat.config.ts → .../@lukso/lsp23-contracts/hardhat.config.ts b/...s/LSP25ExecuteRelayCall/hardhat.config.ts → .../@lukso/lsp23-contracts/hardhat.config.ts
diff --git a/.../LSP23LinkedContractsFactory/package.json → packages/@lukso/lsp23-contracts/package.json b/.../LSP23LinkedContractsFactory/package.json → packages/@lukso/lsp23-contracts/package.json
diff --git a/packages/LSP25ExecuteRelayCall/tsconfig.json → ...ages/@lukso/lsp23-contracts/tsconfig.json b/packages/LSP25ExecuteRelayCall/tsconfig.json → ...ages/@lukso/lsp23-contracts/tsconfig.json
diff --git a/packages/LSP2ERC725YJSONSchema/.eslintrc.js → packages/@lukso/lsp25-contracts/.eslintrc.js b/packages/LSP2ERC725YJSONSchema/.eslintrc.js → packages/@lukso/lsp25-contracts/.eslintrc.js
diff --git a/packages/LSP2ERC725YJSONSchema/.solhint.json → ...ages/@lukso/lsp25-contracts/.solhint.json b/packages/LSP2ERC725YJSONSchema/.solhint.json → ...ages/@lukso/lsp25-contracts/.solhint.json
diff --git a/packages/LSP25ExecuteRelayCall/README.md → packages/@lukso/lsp25-contracts/README.md b/packages/LSP25ExecuteRelayCall/README.md → packages/@lukso/lsp25-contracts/README.md
diff --git a/...Call/contracts/ILSP25ExecuteRelayCall.sol → ...acts/contracts/ILSP25ExecuteRelayCall.sol b/...Call/contracts/ILSP25ExecuteRelayCall.sol → ...acts/contracts/ILSP25ExecuteRelayCall.sol
diff --git a/...uteRelayCall/contracts/LSP25Constants.sol → ...25-contracts/contracts/LSP25Constants.sol b/...uteRelayCall/contracts/LSP25Constants.sol → ...25-contracts/contracts/LSP25Constants.sol
diff --git a/...xecuteRelayCall/contracts/LSP25Errors.sol → ...lsp25-contracts/contracts/LSP25Errors.sol b/...xecuteRelayCall/contracts/LSP25Errors.sol → ...lsp25-contracts/contracts/LSP25Errors.sol
diff --git a/...Call/contracts/LSP25MultiChannelNonce.sol → ...acts/contracts/LSP25MultiChannelNonce.sol b/...Call/contracts/LSP25MultiChannelNonce.sol → ...acts/contracts/LSP25MultiChannelNonce.sol
diff --git a/...ts/Mocks/LSP25MultiChannelNonceTester.sol → ...ts/Mocks/LSP25MultiChannelNonceTester.sol b/...ts/Mocks/LSP25MultiChannelNonceTester.sol → ...ts/Mocks/LSP25MultiChannelNonceTester.sol
diff --git a/...s/LSP2ERC725YJSONSchema/hardhat.config.ts → .../@lukso/lsp25-contracts/hardhat.config.ts b/...s/LSP2ERC725YJSONSchema/hardhat.config.ts → .../@lukso/lsp25-contracts/hardhat.config.ts
diff --git a/packages/LSP25ExecuteRelayCall/package.json → packages/@lukso/lsp25-contracts/package.json b/packages/LSP25ExecuteRelayCall/package.json → packages/@lukso/lsp25-contracts/package.json
diff --git a/...Call/tests/LSP25MultiChannelNonce.test.ts → ...acts/tests/LSP25MultiChannelNonce.test.ts b/...Call/tests/LSP25MultiChannelNonce.test.ts → ...acts/tests/LSP25MultiChannelNonce.test.ts
@@ -1,7 +1,7 @@
 import { ethers } from 'hardhat';
 import { expect } from 'chai';
-import { LSP25_VERSION } from '../../../constants';
-import { LOCAL_PRIVATE_KEYS } from '../../../tests/utils/helpers';
+import { LSP25_VERSION } from '../../../../constants';
+import { LOCAL_PRIVATE_KEYS } from '../../../../tests/utils/helpers';
 import { EIP191Signer } from '@lukso/eip191-signer.js';
 
 import { LSP25MultiChannelNonceTester, LSP25MultiChannelNonceTester__factory } from '../types';

diff --git a/packages/LSP2ERC725YJSONSchema/tsconfig.json → ...ages/@lukso/lsp25-contracts/tsconfig.json b/packages/LSP2ERC725YJSONSchema/tsconfig.json → ...ages/@lukso/lsp25-contracts/tsconfig.json
diff --git a/packages/LSP3ProfileMetadata/.eslintrc.js → packages/@lukso/lsp3-contracts/.eslintrc.js b/packages/LSP3ProfileMetadata/.eslintrc.js → packages/@lukso/lsp3-contracts/.eslintrc.js
diff --git a/packages/LSP3ProfileMetadata/.solhint.json → packages/@lukso/lsp3-contracts/.solhint.json b/packages/LSP3ProfileMetadata/.solhint.json → packages/@lukso/lsp3-contracts/.solhint.json
diff --git a/packages/LSP3ProfileMetadata/README.md → packages/@lukso/lsp3-contracts/README.md b/packages/LSP3ProfileMetadata/README.md → packages/@lukso/lsp3-contracts/README.md
diff --git a/...ofileMetadata/contracts/LSP3Constants.sol → ...sp3-contracts/contracts/LSP3Constants.sol b/...ofileMetadata/contracts/LSP3Constants.sol → ...sp3-contracts/contracts/LSP3Constants.sol
diff --git a/...ges/LSP3ProfileMetadata/hardhat.config.ts → ...s/@lukso/lsp3-contracts/hardhat.config.ts b/...ges/LSP3ProfileMetadata/hardhat.config.ts → ...s/@lukso/lsp3-contracts/hardhat.config.ts
diff --git a/packages/LSP3ProfileMetadata/package.json → packages/@lukso/lsp3-contracts/package.json b/packages/LSP3ProfileMetadata/package.json → packages/@lukso/lsp3-contracts/package.json
diff --git a/packages/LSP3ProfileMetadata/tsconfig.json → packages/@lukso/lsp3-contracts/tsconfig.json b/packages/LSP3ProfileMetadata/tsconfig.json → packages/@lukso/lsp3-contracts/tsconfig.json
diff --git a/...ges/LSP4DigitalAssetMetadata/.eslintrc.js → packages/@lukso/lsp4-contracts/.eslintrc.js b/...ges/LSP4DigitalAssetMetadata/.eslintrc.js → packages/@lukso/lsp4-contracts/.eslintrc.js
diff --git a/...ages/LSP4DigitalAssetMetadata/.gitmodules → packages/@lukso/lsp4-contracts/.gitmodules b/...ages/LSP4DigitalAssetMetadata/.gitmodules → packages/@lukso/lsp4-contracts/.gitmodules
diff --git a/...es/LSP4DigitalAssetMetadata/.solhint.json → packages/@lukso/lsp4-contracts/.solhint.json b/...es/LSP4DigitalAssetMetadata/.solhint.json → packages/@lukso/lsp4-contracts/.solhint.json
diff --git a/packages/LSP4DigitalAssetMetadata/README.md → packages/@lukso/lsp4-contracts/README.md b/packages/LSP4DigitalAssetMetadata/README.md → packages/@lukso/lsp4-contracts/README.md
diff --git a/...AssetMetadata/contracts/LSP4Constants.sol → ...sp4-contracts/contracts/LSP4Constants.sol b/...AssetMetadata/contracts/LSP4Constants.sol → ...sp4-contracts/contracts/LSP4Constants.sol
diff --git a/...ta/contracts/LSP4DigitalAssetMetadata.sol → ...ts/contracts/LSP4DigitalAssetMetadata.sol b/...ta/contracts/LSP4DigitalAssetMetadata.sol → ...ts/contracts/LSP4DigitalAssetMetadata.sol
diff --git a/...ontracts/LSP4DigitalAssetMetadataCore.sol → ...ontracts/LSP4DigitalAssetMetadataCore.sol b/...ontracts/LSP4DigitalAssetMetadataCore.sol → ...ontracts/LSP4DigitalAssetMetadataCore.sol
diff --git a/.../LSP4DigitalAssetMetadataInitAbstract.sol → .../LSP4DigitalAssetMetadataInitAbstract.sol b/.../LSP4DigitalAssetMetadataInitAbstract.sol → .../LSP4DigitalAssetMetadataInitAbstract.sol
diff --git a/...talAssetMetadata/contracts/LSP4Errors.sol → ...o/lsp4-contracts/contracts/LSP4Errors.sol b/...talAssetMetadata/contracts/LSP4Errors.sol → ...o/lsp4-contracts/contracts/LSP4Errors.sol
diff --git a/...SP4DigitalAssetMetadata/hardhat.config.ts → ...s/@lukso/lsp4-contracts/hardhat.config.ts b/...SP4DigitalAssetMetadata/hardhat.config.ts → ...s/@lukso/lsp4-contracts/hardhat.config.ts
diff --git a/...ges/LSP4DigitalAssetMetadata/package.json → packages/@lukso/lsp4-contracts/package.json b/...ges/LSP4DigitalAssetMetadata/package.json → packages/@lukso/lsp4-contracts/package.json
diff --git a/...es/LSP4DigitalAssetMetadata/tsconfig.json → packages/@lukso/lsp4-contracts/tsconfig.json b/...es/LSP4DigitalAssetMetadata/tsconfig.json → packages/@lukso/lsp4-contracts/tsconfig.json
diff --git a/packages/LSP5ReceivedAssets/.eslintrc.js → packages/@lukso/lsp5-contracts/.eslintrc.js b/packages/LSP5ReceivedAssets/.eslintrc.js → packages/@lukso/lsp5-contracts/.eslintrc.js
diff --git a/packages/LSP5ReceivedAssets/.solhint.json → packages/@lukso/lsp5-contracts/.solhint.json b/packages/LSP5ReceivedAssets/.solhint.json → packages/@lukso/lsp5-contracts/.solhint.json
diff --git a/packages/LSP5ReceivedAssets/README.md → packages/@lukso/lsp5-contracts/README.md b/packages/LSP5ReceivedAssets/README.md → packages/@lukso/lsp5-contracts/README.md
diff --git a/...eceivedAssets/contracts/LSP5Constants.sol → ...sp5-contracts/contracts/LSP5Constants.sol b/...eceivedAssets/contracts/LSP5Constants.sol → ...sp5-contracts/contracts/LSP5Constants.sol
diff --git a/...SP5ReceivedAssets/contracts/LSP5Utils.sol → ...so/lsp5-contracts/contracts/LSP5Utils.sol b/...SP5ReceivedAssets/contracts/LSP5Utils.sol → ...so/lsp5-contracts/contracts/LSP5Utils.sol
diff --git a/...ages/LSP5ReceivedAssets/hardhat.config.ts → ...s/@lukso/lsp5-contracts/hardhat.config.ts b/...ages/LSP5ReceivedAssets/hardhat.config.ts → ...s/@lukso/lsp5-contracts/hardhat.config.ts
diff --git a/packages/LSP5ReceivedAssets/package.json → packages/@lukso/lsp5-contracts/package.json b/packages/LSP5ReceivedAssets/package.json → packages/@lukso/lsp5-contracts/package.json
diff --git a/packages/LSP5ReceivedAssets/tsconfig.json → packages/@lukso/lsp5-contracts/tsconfig.json b/packages/LSP5ReceivedAssets/tsconfig.json → packages/@lukso/lsp5-contracts/tsconfig.json
diff --git a/packages/LSP6KeyManager/.eslintrc.js → packages/@lukso/lsp6-contracts/.eslintrc.js b/packages/LSP6KeyManager/.eslintrc.js → packages/@lukso/lsp6-contracts/.eslintrc.js
diff --git a/packages/LSP6KeyManager/.prettierignore → ...ges/@lukso/lsp6-contracts/.prettierignore b/packages/LSP6KeyManager/.prettierignore → ...ges/@lukso/lsp6-contracts/.prettierignore
diff --git a/packages/LSP6KeyManager/.solhint.json → packages/@lukso/lsp6-contracts/.solhint.json b/packages/LSP6KeyManager/.solhint.json → packages/@lukso/lsp6-contracts/.solhint.json
diff --git a/packages/LSP6KeyManager/README.md → packages/@lukso/lsp6-contracts/README.md b/packages/LSP6KeyManager/README.md → packages/@lukso/lsp6-contracts/README.md
diff --git a/...6KeyManager/contracts/ILSP6KeyManager.sol → ...6-contracts/contracts/ILSP6KeyManager.sol b/...6KeyManager/contracts/ILSP6KeyManager.sol → ...6-contracts/contracts/ILSP6KeyManager.sol
diff --git a/...SP6KeyManager/contracts/LSP6Constants.sol → ...sp6-contracts/contracts/LSP6Constants.sol b/...SP6KeyManager/contracts/LSP6Constants.sol → ...sp6-contracts/contracts/LSP6Constants.sol
diff --git a/...s/LSP6KeyManager/contracts/LSP6Errors.sol → ...o/lsp6-contracts/contracts/LSP6Errors.sol b/...s/LSP6KeyManager/contracts/LSP6Errors.sol → ...o/lsp6-contracts/contracts/LSP6Errors.sol
diff --git a/...P6KeyManager/contracts/LSP6KeyManager.sol → ...p6-contracts/contracts/LSP6KeyManager.sol b/...P6KeyManager/contracts/LSP6KeyManager.sol → ...p6-contracts/contracts/LSP6KeyManager.sol
diff --git a/...yManager/contracts/LSP6KeyManagerCore.sol → ...ontracts/contracts/LSP6KeyManagerCore.sol b/...yManager/contracts/LSP6KeyManagerCore.sol → ...ontracts/contracts/LSP6KeyManagerCore.sol
diff --git a/...yManager/contracts/LSP6KeyManagerInit.sol → ...ontracts/contracts/LSP6KeyManagerInit.sol b/...yManager/contracts/LSP6KeyManagerInit.sol → ...ontracts/contracts/LSP6KeyManagerInit.sol
diff --git a/.../contracts/LSP6KeyManagerInitAbstract.sol → .../contracts/LSP6KeyManagerInitAbstract.sol b/.../contracts/LSP6KeyManagerInitAbstract.sol → .../contracts/LSP6KeyManagerInitAbstract.sol
diff --git a/...ntracts/LSP6Modules/LSP6ExecuteModule.sol → ...ntracts/LSP6Modules/LSP6ExecuteModule.sol b/...ntracts/LSP6Modules/LSP6ExecuteModule.sol → ...ntracts/LSP6Modules/LSP6ExecuteModule.sol
diff --git a/...SP6Modules/LSP6ExecuteRelayCallModule.sol → ...SP6Modules/LSP6ExecuteRelayCallModule.sol b/...SP6Modules/LSP6ExecuteRelayCallModule.sol → ...SP6Modules/LSP6ExecuteRelayCallModule.sol
diff --git a/...racts/LSP6Modules/LSP6OwnershipModule.sol → ...racts/LSP6Modules/LSP6OwnershipModule.sol b/...racts/LSP6Modules/LSP6OwnershipModule.sol → ...racts/LSP6Modules/LSP6OwnershipModule.sol
diff --git a/...ntracts/LSP6Modules/LSP6SetDataModule.sol → ...ntracts/LSP6Modules/LSP6SetDataModule.sol b/...ntracts/LSP6Modules/LSP6SetDataModule.sol → ...ntracts/LSP6Modules/LSP6SetDataModule.sol
diff --git a/...es/LSP6KeyManager/contracts/LSP6Utils.sol → ...so/lsp6-contracts/contracts/LSP6Utils.sol b/...es/LSP6KeyManager/contracts/LSP6Utils.sol → ...so/lsp6-contracts/contracts/LSP6Utils.sol
diff --git a/...r/contracts/Mocks/FallbackInitializer.sol → ...s/contracts/Mocks/FallbackInitializer.sol b/...r/contracts/Mocks/FallbackInitializer.sol → ...s/contracts/Mocks/FallbackInitializer.sol
diff --git a/...racts/Mocks/KeyManagerInternalsTester.sol → ...racts/Mocks/KeyManagerInternalsTester.sol b/...racts/Mocks/KeyManagerInternalsTester.sol → ...racts/Mocks/KeyManagerInternalsTester.sol
diff --git a/...anager/contracts/Mocks/TargetContract.sol → ...tracts/contracts/Mocks/TargetContract.sol b/...anager/contracts/Mocks/TargetContract.sol → ...tracts/contracts/Mocks/TargetContract.sol
diff --git a/...ages/LSP6KeyManager/contracts/Version.sol → ...ukso/lsp6-contracts/contracts/Version.sol b/...ages/LSP6KeyManager/contracts/Version.sol → ...ukso/lsp6-contracts/contracts/Version.sol
diff --git a/...es/LSP6KeyManager/contracts/constants.sol → ...so/lsp6-contracts/contracts/constants.sol b/...es/LSP6KeyManager/contracts/constants.sol → ...so/lsp6-contracts/contracts/constants.sol
diff --git a/...anager/foundry/LSP6AllowedCallsTest.t.sol → ...tracts/foundry/LSP6AllowedCallsTest.t.sol b/...anager/foundry/LSP6AllowedCallsTest.t.sol → ...tracts/foundry/LSP6AllowedCallsTest.t.sol
diff --git a/...6KeyManager/foundry/LSP6SetDataTest.t.sol → ...6-contracts/foundry/LSP6SetDataTest.t.sol b/...6KeyManager/foundry/LSP6SetDataTest.t.sol → ...6-contracts/foundry/LSP6SetDataTest.t.sol
diff --git a/...es/LSP6KeyManager/foundry/LSP6Utils.t.sol → ...so/lsp6-contracts/foundry/LSP6Utils.t.sol b/...es/LSP6KeyManager/foundry/LSP6Utils.t.sol → ...so/lsp6-contracts/foundry/LSP6Utils.t.sol
diff --git a/packages/LSP6KeyManager/hardhat.config.ts → ...s/@lukso/lsp6-contracts/hardhat.config.ts b/packages/LSP6KeyManager/hardhat.config.ts → ...s/@lukso/lsp6-contracts/hardhat.config.ts
diff --git a/packages/LSP6KeyManager/package.json → packages/@lukso/lsp6-contracts/package.json b/packages/LSP6KeyManager/package.json → packages/@lukso/lsp6-contracts/package.json
diff --git a/packages/LSP6KeyManager/tsconfig.json → packages/@lukso/lsp6-contracts/tsconfig.json b/packages/LSP6KeyManager/tsconfig.json → packages/@lukso/lsp6-contracts/tsconfig.json
diff --git a/packages/LSP7DigitalAsset/.eslintrc.js → packages/@lukso/lsp7-contracts/.eslintrc.js b/packages/LSP7DigitalAsset/.eslintrc.js → packages/@lukso/lsp7-contracts/.eslintrc.js
diff --git a/packages/LSP7DigitalAsset/.solhint.json → packages/@lukso/lsp7-contracts/.solhint.json b/packages/LSP7DigitalAsset/.solhint.json → packages/@lukso/lsp7-contracts/.solhint.json
diff --git a/packages/LSP7DigitalAsset/README.md → packages/@lukso/lsp7-contracts/README.md b/packages/LSP7DigitalAsset/README.md → packages/@lukso/lsp7-contracts/README.md
diff --git a/...italAsset/contracts/ILSP7DigitalAsset.sol → ...contracts/contracts/ILSP7DigitalAsset.sol b/...italAsset/contracts/ILSP7DigitalAsset.sol → ...contracts/contracts/ILSP7DigitalAsset.sol
diff --git a/...7DigitalAsset/contracts/LSP7Constants.sol → ...sp7-contracts/contracts/LSP7Constants.sol b/...7DigitalAsset/contracts/LSP7Constants.sol → ...sp7-contracts/contracts/LSP7Constants.sol
diff --git a/...gitalAsset/contracts/LSP7DigitalAsset.sol → ...-contracts/contracts/LSP7DigitalAsset.sol b/...gitalAsset/contracts/LSP7DigitalAsset.sol → ...-contracts/contracts/LSP7DigitalAsset.sol
diff --git a/...lAsset/contracts/LSP7DigitalAssetCore.sol → ...tracts/contracts/LSP7DigitalAssetCore.sol b/...lAsset/contracts/LSP7DigitalAssetCore.sol → ...tracts/contracts/LSP7DigitalAssetCore.sol
diff --git a/...ontracts/LSP7DigitalAssetInitAbstract.sol → ...ontracts/LSP7DigitalAssetInitAbstract.sol b/...ontracts/LSP7DigitalAssetInitAbstract.sol → ...ontracts/LSP7DigitalAssetInitAbstract.sol
diff --git a/...LSP7DigitalAsset/contracts/LSP7Errors.sol → ...o/lsp7-contracts/contracts/LSP7Errors.sol b/...LSP7DigitalAsset/contracts/LSP7Errors.sol → ...o/lsp7-contracts/contracts/LSP7Errors.sol
diff --git a/...set/contracts/extensions/LSP7Burnable.sol → ...cts/contracts/extensions/LSP7Burnable.sol b/...set/contracts/extensions/LSP7Burnable.sol → ...cts/contracts/extensions/LSP7Burnable.sol
diff --git a/...s/extensions/LSP7BurnableInitAbstract.sol → ...s/extensions/LSP7BurnableInitAbstract.sol b/...s/extensions/LSP7BurnableInitAbstract.sol → ...s/extensions/LSP7BurnableInitAbstract.sol
diff --git a/...contracts/extensions/LSP7CappedSupply.sol → ...contracts/extensions/LSP7CappedSupply.sol b/...contracts/extensions/LSP7CappedSupply.sol → ...contracts/extensions/LSP7CappedSupply.sol
diff --git a/...tensions/LSP7CappedSupplyInitAbstract.sol → ...tensions/LSP7CappedSupplyInitAbstract.sol b/...tensions/LSP7CappedSupplyInitAbstract.sol → ...tensions/LSP7CappedSupplyInitAbstract.sol
diff --git a/...Asset/contracts/presets/ILSP7Mintable.sol → ...racts/contracts/presets/ILSP7Mintable.sol b/...Asset/contracts/presets/ILSP7Mintable.sol → ...racts/contracts/presets/ILSP7Mintable.sol
diff --git a/...lAsset/contracts/presets/LSP7Mintable.sol → ...tracts/contracts/presets/LSP7Mintable.sol b/...lAsset/contracts/presets/LSP7Mintable.sol → ...tracts/contracts/presets/LSP7Mintable.sol
diff --git a/...et/contracts/presets/LSP7MintableInit.sol → ...ts/contracts/presets/LSP7MintableInit.sol b/...et/contracts/presets/LSP7MintableInit.sol → ...ts/contracts/presets/LSP7MintableInit.sol
diff --git a/...acts/presets/LSP7MintableInitAbstract.sol → ...acts/presets/LSP7MintableInitAbstract.sol b/...acts/presets/LSP7MintableInitAbstract.sol → ...acts/presets/LSP7MintableInitAbstract.sol
diff --git a/packages/LSP7DigitalAsset/hardhat.config.ts → ...s/@lukso/lsp7-contracts/hardhat.config.ts b/packages/LSP7DigitalAsset/hardhat.config.ts → ...s/@lukso/lsp7-contracts/hardhat.config.ts
diff --git a/packages/LSP7DigitalAsset/package.json → packages/@lukso/lsp7-contracts/package.json b/packages/LSP7DigitalAsset/package.json → packages/@lukso/lsp7-contracts/package.json
diff --git a/packages/LSP7DigitalAsset/tsconfig.json → packages/@lukso/lsp7-contracts/tsconfig.json b/packages/LSP7DigitalAsset/tsconfig.json → packages/@lukso/lsp7-contracts/tsconfig.json
diff --git a/...LSP8IdentifiableDigitalAsset/.eslintrc.js → packages/@lukso/lsp8-contracts/.eslintrc.js b/...LSP8IdentifiableDigitalAsset/.eslintrc.js → packages/@lukso/lsp8-contracts/.eslintrc.js
diff --git a/...SP8IdentifiableDigitalAsset/.solhint.json → packages/@lukso/lsp8-contracts/.solhint.json b/...SP8IdentifiableDigitalAsset/.solhint.json → packages/@lukso/lsp8-contracts/.solhint.json
diff --git a/...es/LSP8IdentifiableDigitalAsset/README.md → packages/@lukso/lsp8-contracts/README.md b/...es/LSP8IdentifiableDigitalAsset/README.md → packages/@lukso/lsp8-contracts/README.md
diff --git a/...ntracts/ILSP8IdentifiableDigitalAsset.sol → ...ntracts/ILSP8IdentifiableDigitalAsset.sol b/...ntracts/ILSP8IdentifiableDigitalAsset.sol → ...ntracts/ILSP8IdentifiableDigitalAsset.sol
diff --git a/...eDigitalAsset/contracts/LSP8Constants.sol → ...sp8-contracts/contracts/LSP8Constants.sol b/...eDigitalAsset/contracts/LSP8Constants.sol → ...sp8-contracts/contracts/LSP8Constants.sol
diff --git a/...ableDigitalAsset/contracts/LSP8Errors.sol → ...o/lsp8-contracts/contracts/LSP8Errors.sol b/...ableDigitalAsset/contracts/LSP8Errors.sol → ...o/lsp8-contracts/contracts/LSP8Errors.sol
diff --git a/...ontracts/LSP8IdentifiableDigitalAsset.sol → ...ontracts/LSP8IdentifiableDigitalAsset.sol b/...ontracts/LSP8IdentifiableDigitalAsset.sol → ...ontracts/LSP8IdentifiableDigitalAsset.sol
diff --git a/...acts/LSP8IdentifiableDigitalAssetCore.sol → ...acts/LSP8IdentifiableDigitalAssetCore.sol b/...acts/LSP8IdentifiableDigitalAssetCore.sol → ...acts/LSP8IdentifiableDigitalAssetCore.sol
diff --git a/...8IdentifiableDigitalAssetInitAbstract.sol → ...8IdentifiableDigitalAssetInitAbstract.sol b/...8IdentifiableDigitalAssetInitAbstract.sol → ...8IdentifiableDigitalAssetInitAbstract.sol
diff --git a/...set/contracts/extensions/LSP8Burnable.sol → ...cts/contracts/extensions/LSP8Burnable.sol b/...set/contracts/extensions/LSP8Burnable.sol → ...cts/contracts/extensions/LSP8Burnable.sol
diff --git a/...s/extensions/LSP8BurnableInitAbstract.sol → ...s/extensions/LSP8BurnableInitAbstract.sol b/...s/extensions/LSP8BurnableInitAbstract.sol → ...s/extensions/LSP8BurnableInitAbstract.sol
diff --git a/...contracts/extensions/LSP8CappedSupply.sol → ...contracts/extensions/LSP8CappedSupply.sol b/...contracts/extensions/LSP8CappedSupply.sol → ...contracts/extensions/LSP8CappedSupply.sol
diff --git a/...tensions/LSP8CappedSupplyInitAbstract.sol → ...tensions/LSP8CappedSupplyInitAbstract.sol b/...tensions/LSP8CappedSupplyInitAbstract.sol → ...tensions/LSP8CappedSupplyInitAbstract.sol
diff --git a/...t/contracts/extensions/LSP8Enumerable.sol → ...s/contracts/extensions/LSP8Enumerable.sol b/...t/contracts/extensions/LSP8Enumerable.sol → ...s/contracts/extensions/LSP8Enumerable.sol
diff --git a/...extensions/LSP8EnumerableInitAbstract.sol → ...extensions/LSP8EnumerableInitAbstract.sol b/...extensions/LSP8EnumerableInitAbstract.sol → ...extensions/LSP8EnumerableInitAbstract.sol
diff --git a/...Asset/contracts/presets/ILSP8Mintable.sol → ...racts/contracts/presets/ILSP8Mintable.sol b/...Asset/contracts/presets/ILSP8Mintable.sol → ...racts/contracts/presets/ILSP8Mintable.sol
diff --git a/...lAsset/contracts/presets/LSP8Mintable.sol → ...tracts/contracts/presets/LSP8Mintable.sol b/...lAsset/contracts/presets/LSP8Mintable.sol → ...tracts/contracts/presets/LSP8Mintable.sol
diff --git a/...et/contracts/presets/LSP8MintableInit.sol → ...ts/contracts/presets/LSP8MintableInit.sol b/...et/contracts/presets/LSP8MintableInit.sol → ...ts/contracts/presets/LSP8MintableInit.sol
diff --git a/...acts/presets/LSP8MintableInitAbstract.sol → ...acts/presets/LSP8MintableInitAbstract.sol b/...acts/presets/LSP8MintableInitAbstract.sol → ...acts/presets/LSP8MintableInitAbstract.sol
diff --git a/...dentifiableDigitalAsset/hardhat.config.ts → ...s/@lukso/lsp8-contracts/hardhat.config.ts b/...dentifiableDigitalAsset/hardhat.config.ts → ...s/@lukso/lsp8-contracts/hardhat.config.ts
diff --git a/...LSP8IdentifiableDigitalAsset/package.json → packages/@lukso/lsp8-contracts/package.json b/...LSP8IdentifiableDigitalAsset/package.json → packages/@lukso/lsp8-contracts/package.json
diff --git a/...SP8IdentifiableDigitalAsset/tsconfig.json → packages/@lukso/lsp8-contracts/tsconfig.json b/...SP8IdentifiableDigitalAsset/tsconfig.json → packages/@lukso/lsp8-contracts/tsconfig.json
diff --git a/packages/LSP9Vault/.eslintrc.js → packages/@lukso/lsp9-contracts/.eslintrc.js b/packages/LSP9Vault/.eslintrc.js → packages/@lukso/lsp9-contracts/.eslintrc.js
diff --git a/packages/LSP9Vault/.solhint.json → packages/@lukso/lsp9-contracts/.solhint.json b/packages/LSP9Vault/.solhint.json → packages/@lukso/lsp9-contracts/.solhint.json
diff --git a/packages/LSP9Vault/README.md → packages/@lukso/lsp9-contracts/README.md b/packages/LSP9Vault/README.md → packages/@lukso/lsp9-contracts/README.md
diff --git a/packages/LSP9Vault/contracts/ILSP9Vault.sol → ...o/lsp9-contracts/contracts/ILSP9Vault.sol b/packages/LSP9Vault/contracts/ILSP9Vault.sol → ...o/lsp9-contracts/contracts/ILSP9Vault.sol
diff --git a/...ges/LSP9Vault/contracts/LSP9Constants.sol → ...sp9-contracts/contracts/LSP9Constants.sol b/...ges/LSP9Vault/contracts/LSP9Constants.sol → ...sp9-contracts/contracts/LSP9Constants.sol
diff --git a/packages/LSP9Vault/contracts/LSP9Errors.sol → ...o/lsp9-contracts/contracts/LSP9Errors.sol b/packages/LSP9Vault/contracts/LSP9Errors.sol → ...o/lsp9-contracts/contracts/LSP9Errors.sol
diff --git a/packages/LSP9Vault/contracts/LSP9Vault.sol → ...so/lsp9-contracts/contracts/LSP9Vault.sol b/packages/LSP9Vault/contracts/LSP9Vault.sol → ...so/lsp9-contracts/contracts/LSP9Vault.sol
diff --git a/...ges/LSP9Vault/contracts/LSP9VaultCore.sol → ...sp9-contracts/contracts/LSP9VaultCore.sol b/...ges/LSP9Vault/contracts/LSP9VaultCore.sol → ...sp9-contracts/contracts/LSP9VaultCore.sol
diff --git a/...ges/LSP9Vault/contracts/LSP9VaultInit.sol → ...sp9-contracts/contracts/LSP9VaultInit.sol b/...ges/LSP9Vault/contracts/LSP9VaultInit.sol → ...sp9-contracts/contracts/LSP9VaultInit.sol
diff --git a/...Vault/contracts/LSP9VaultInitAbstract.sol → ...racts/contracts/LSP9VaultInitAbstract.sol b/...Vault/contracts/LSP9VaultInitAbstract.sol → ...racts/contracts/LSP9VaultInitAbstract.sol
diff --git a/packages/LSP9Vault/contracts/Version.sol → ...ukso/lsp9-contracts/contracts/Version.sol b/packages/LSP9Vault/contracts/Version.sol → ...ukso/lsp9-contracts/contracts/Version.sol
diff --git a/packages/LSP9Vault/hardhat.config.ts → ...s/@lukso/lsp9-contracts/hardhat.config.ts b/packages/LSP9Vault/hardhat.config.ts → ...s/@lukso/lsp9-contracts/hardhat.config.ts
diff --git a/packages/LSP9Vault/package.json → packages/@lukso/lsp9-contracts/package.json b/packages/LSP9Vault/package.json → packages/@lukso/lsp9-contracts/package.json
diff --git a/packages/LSP9Vault/tsconfig.json → packages/@lukso/lsp9-contracts/tsconfig.json b/packages/LSP9Vault/tsconfig.json → packages/@lukso/lsp9-contracts/tsconfig.json
diff --git a/packages/UniversalProfile/.eslintrc.js → ...o/universalprofile-contracts/.eslintrc.js b/packages/UniversalProfile/.eslintrc.js → ...o/universalprofile-contracts/.eslintrc.js
diff --git a/packages/UniversalProfile/.solhint.json → .../universalprofile-contracts/.solhint.json b/packages/UniversalProfile/.solhint.json → .../universalprofile-contracts/.solhint.json
diff --git a/packages/UniversalProfile/README.md → ...ukso/universalprofile-contracts/README.md b/packages/UniversalProfile/README.md → ...ukso/universalprofile-contracts/README.md
diff --git a/.../UniversalProfile/contracts/Constants.sol → ...profile-contracts/contracts/Constants.sol b/.../UniversalProfile/contracts/Constants.sol → ...profile-contracts/contracts/Constants.sol
diff --git a/...salProfile/contracts/UniversalProfile.sol → ...-contracts/contracts/UniversalProfile.sol b/...salProfile/contracts/UniversalProfile.sol → ...-contracts/contracts/UniversalProfile.sol
diff --git a/...rofile/contracts/UniversalProfileInit.sol → ...tracts/contracts/UniversalProfileInit.sol b/...rofile/contracts/UniversalProfileInit.sol → ...tracts/contracts/UniversalProfileInit.sol
diff --git a/...ontracts/UniversalProfileInitAbstract.sol → ...ontracts/UniversalProfileInitAbstract.sol b/...ontracts/UniversalProfileInitAbstract.sol → ...ontracts/UniversalProfileInitAbstract.sol
diff --git a/...es/UniversalProfile/contracts/Version.sol → ...alprofile-contracts/contracts/Version.sol b/...es/UniversalProfile/contracts/Version.sol → ...alprofile-contracts/contracts/Version.sol
diff --git a/packages/UniversalProfile/hardhat.config.ts → ...versalprofile-contracts/hardhat.config.ts b/packages/UniversalProfile/hardhat.config.ts → ...versalprofile-contracts/hardhat.config.ts
diff --git a/packages/UniversalProfile/package.json → ...o/universalprofile-contracts/package.json b/packages/UniversalProfile/package.json → ...o/universalprofile-contracts/package.json
diff --git a/packages/UniversalProfile/tsconfig.json → .../universalprofile-contracts/tsconfig.json b/packages/UniversalProfile/tsconfig.json → .../universalprofile-contracts/tsconfig.json
diff --git a/remappings.txt b/remappings.txt
@@ -7,24 +7,4 @@ hardhat-deploy/=node_modules/hardhat-deploy/
 hardhat/=node_modules/hardhat/
 solidity-bytes-utils/=node_modules/solidity-bytes-utils/
 ds-test/=lib/forge-std/lib/ds-test/src/
-@lukso/lsp0-contracts/=packages/LSP0ERC725Account/
-@lukso/lsp1-contracts/=packages/LSP1UniversalReceiver/
-@lukso/lsp1delegate-contracts/=packages/LSP1UniversalReceiverDelegate/
-@lukso/lsp2-contracts/=packages/LSP2ERC725YJSONSchema/
-@lukso/lsp3-contracts/=packages/LSP3ProfileMetadata/
-@lukso/lsp4-contracts/=packages/LSP4DigitalAssetMetadata/
-@lukso/lsp5-contracts/=packages/LSP5ReceivedAssets/
-@lukso/lsp6-contracts/=packages/LSP6KeyManager/
-@lukso/lsp7-contracts/=packages/LSP7DigitalAsset/
-@lukso/lsp8-contracts/=packages/LSP8IdentifiableDigitalAsset/
-@lukso/lsp9-contracts/=packages/LSP9Vault/
-@lukso/lsp10-contracts/=packages/LSP10ReceivedVaults/
-@lukso/lsp12-contracts/=packages/LSP12IssuedAssets/
-@lukso/lsp14-contracts/=packages/LSP14Ownable2Step/
-@lukso/lsp16-contracts/=packages/LSP16UniversalFactory/
-@lukso/lsp17contractextension-contracts/=packages/LSP17ContractExtension/
-@lukso/lsp17-contracts/=packages/LSP17Extensions
-@lukso/lsp20-contracts/=packages/LSP20CallVerification/
-@lukso/lsp23-contracts/=packages/LSP23LinkedContractsDeployment/
-@lukso/lsp25-contracts/=packages/LSP25ExecuteRelayCall/
-@lukso/universalprofile-contracts/=packages/UniversalProfile/
+@=packages/@
diff --git a/tests/LSP20CallVerification/LSP20WithLSP14.behaviour.ts b/tests/LSP20CallVerification/LSP20WithLSP14.behaviour.ts
@@ -3,7 +3,7 @@ import { ethers, network, artifacts } from 'hardhat';
 
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { UPWithInstantAcceptOwnership__factory, UPWithInstantAcceptOwnership } from '../../types';
-import { LSP0ERC725Account } from '@lukso/lsp0-contracts/types';
+import { LSP0ERC725Account } from '../../packages/@lukso/lsp0-contracts/types';
 
 // constants
 import { OPERATION_TYPES } from '../../constants';

diff --git a/tests/LSP6KeyManager/LSP6ControlledToken.test.ts b/tests/LSP6KeyManager/LSP6ControlledToken.test.ts
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { BytesLike } from 'ethers';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
-import { LSP0ERC725Account__factory } from '@lukso/lsp0-contracts/types';
+import { LSP0ERC725Account__factory } from '../../packages/@lukso/lsp0-contracts/types';
 import { LSP6KeyManager, LSP6KeyManager__factory } from '@lukso/lsp6-contracts/types';
 import { LSP7Mintable, LSP7Mintable__factory } from '@lukso/lsp7-contracts/types';
 import { LSP8Mintable } from '@lukso/lsp8-contracts/types';

diff --git a/tests/UniversalProfileInit.test.ts b/tests/UniversalProfileInit.test.ts
@@ -2,7 +2,7 @@ import { ethers } from 'hardhat';
 import { expect } from 'chai';
 import { UniversalReceiverTester__factory } from '../types';
 import { UniversalProfileInit__factory } from '@lukso/universalprofile-contracts/types';
-import { LSP0ERC725Account } from '@lukso/lsp0-contracts/types';
+import { LSP0ERC725Account } from '../packages/@lukso/lsp0-contracts/types';
 import { deployProxy } from './utils/fixtures';
 
 import {