refactor: folder structure

Makefile

@@ -14,7 +14,7 @@ deploy-polygon :; forge script script/DeployTransparentProxyFactory.s.sol:Deploy
 deploy-avalanche :; forge script script/DeployTransparentProxyFactory.s.sol:DeployAvalanche --rpc-url avalanche --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
 deploy-optimism :; forge script script/DeployTransparentProxyFactory.s.sol:DeployOptimism --rpc-url optimism --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
 deploy-arbitrum :; forge script script/DeployTransparentProxyFactory.s.sol:DeployArbitrum --rpc-url arbitrum --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
-deploy-zksync	:; forge script script-zksync/DeployTransparentProxyFactoryZkSync.s.sol:DeployZkSync --zksync --system-mode=true --rpc-url zksync --broadcast --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
+deploy-zksync	:; FOUNDRY_PROFILE=zksync forge script zksync/script/DeployTransparentProxyFactoryZkSync.s.sol:DeployZkSync --zksync --system-mode=true --rpc-url zksync --broadcast --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
 
 # ---------------------------------------------- BASE SCRIPT CONFIGURATION ---------------------------------------------
 

foundry.toml

@@ -7,17 +7,16 @@ libs = ['lib']
 remappings = []
 
 [profile.zksync]
-src = 'src-zksync'
-test = 'test-zksync'
-script = 'script-zksync'
+src = 'zksync/src'
+test = 'zksync/test'
+script = 'zksync/script'
 libs = ['lib']
-solc="0.8.24"
-evm_version = "cancun"
+solc = '0.8.24'
 
 [profile.zksync.zksync]
 fallback_oz = true
 mode = "3"
-zksolc="1.4.1"
+zksolc = "1.4.1"
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config
 [rpc_endpoints]

script-zksync/DeployTransparentProxyFactoryZkSync.s.sol → zksync/script/DeployTransparentProxyFactoryZkSync.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {Script} from 'forge-std/Script.sol';
-import {TransparentProxyFactoryZkSync} from '../src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol';
+import {TransparentProxyFactoryZkSync} from '../src/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol';
 
 contract DeployZkSync is Script {
   function run() external {

src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol → zksync/src/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.24;
 
-import {TransparentProxyFactoryBase} from '../../../src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol';
+import {TransparentProxyFactoryBase} from '../../../../src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol';
 import {ITransparentProxyFactoryZkSync} from './interfaces/ITransparentProxyFactoryZkSync.sol';
 
 /**

test-zksync/TransparentProxyFactoryZkSync.t.sol → zksync/test/TransparentProxyFactoryZkSync.t.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.24;
 
 import {Test} from 'forge-std/Test.sol';
-import {TransparentProxyFactoryZkSync} from '../src-zksync/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol';
-import {TransparentUpgradeableProxy} from '../src/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
-import {IOwnable} from '../src/contracts/transparent-proxy/interfaces/IOwnable.sol';
-import {MockImpl} from '../src/mocks/MockImpl.sol';
+import {TransparentProxyFactoryZkSync} from '../src/contracts/transparent-proxy/TransparentProxyFactoryZkSync.sol';
+import {TransparentUpgradeableProxy} from '../../src/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
+import {IOwnable} from '../../src/contracts/transparent-proxy/interfaces/IOwnable.sol';
+import {MockImpl} from '../../src/mocks/MockImpl.sol';
 
 contract TestTransparentProxyFactoryZkSync is Test {
   TransparentProxyFactoryZkSync internal factory;