diff --git a/src/UniStatusViewer.sol b/src/uniV3/UniStatusViewer.sol
similarity index 100%
rename from src/UniStatusViewer.sol
rename to src/uniV3/UniStatusViewer.sol
diff --git a/src/UniVaultProxy.sol b/src/uniV3/UniVaultProxy.sol
similarity index 100%
rename from src/UniVaultProxy.sol
rename to src/uniV3/UniVaultProxy.sol
diff --git a/src/UniVaultStorageV1.sol b/src/uniV3/UniVaultStorageV1.sol
similarity index 100%
rename from src/UniVaultStorageV1.sol
rename to src/uniV3/UniVaultStorageV1.sol
diff --git a/src/UniVaultUpgradeableV1.sol b/src/uniV3/UniVaultUpgradeableV1.sol
similarity index 100%
rename from src/UniVaultUpgradeableV1.sol
rename to src/uniV3/UniVaultUpgradeableV1.sol
diff --git a/src/Zap.sol b/src/uniV3/Zap.sol
similarity index 100%
rename from src/Zap.sol
rename to src/uniV3/Zap.sol
diff --git a/src/beacon/UniVaultBeacon.sol b/src/uniV3/beacon/UniVaultBeacon.sol
similarity index 100%
rename from src/beacon/UniVaultBeacon.sol
rename to src/uniV3/beacon/UniVaultBeacon.sol
diff --git a/src/beacon/UniVaultBeaconProxyImplementation.sol b/src/uniV3/beacon/UniVaultBeaconProxyImplementation.sol
similarity index 100%
rename from src/beacon/UniVaultBeaconProxyImplementation.sol
rename to src/uniV3/beacon/UniVaultBeaconProxyImplementation.sol
diff --git a/src/factory/UniV3VaultFactory.sol b/src/uniV3/factory/UniV3VaultFactory.sol
similarity index 100%
rename from src/factory/UniV3VaultFactory.sol
rename to src/uniV3/factory/UniV3VaultFactory.sol
diff --git a/src/inheritance/ControllableInit.sol b/src/uniV3/inheritance/ControllableInit.sol
similarity index 100%
rename from src/inheritance/ControllableInit.sol
rename to src/uniV3/inheritance/ControllableInit.sol
diff --git a/src/inheritance/GovernableInit.sol b/src/uniV3/inheritance/GovernableInit.sol
similarity index 100%
rename from src/inheritance/GovernableInit.sol
rename to src/uniV3/inheritance/GovernableInit.sol
diff --git a/src/inheritance/Storage.sol b/src/uniV3/inheritance/Storage.sol
similarity index 100%
rename from src/inheritance/Storage.sol
rename to src/uniV3/inheritance/Storage.sol
diff --git a/src/interface/IController.sol b/src/uniV3/interface/IController.sol
similarity index 100%
rename from src/interface/IController.sol
rename to src/uniV3/interface/IController.sol
diff --git a/src/interface/IFeeRewardForwarderV6.sol b/src/uniV3/interface/IFeeRewardForwarderV6.sol
similarity index 100%
rename from src/interface/IFeeRewardForwarderV6.sol
rename to src/uniV3/interface/IFeeRewardForwarderV6.sol
diff --git a/src/interface/IRewardPool.sol b/src/uniV3/interface/IRewardPool.sol
similarity index 100%
rename from src/interface/IRewardPool.sol
rename to src/uniV3/interface/IRewardPool.sol
diff --git a/src/interface/IUniVaultStorageV1.sol b/src/uniV3/interface/IUniVaultStorageV1.sol
similarity index 100%
rename from src/interface/IUniVaultStorageV1.sol
rename to src/uniV3/interface/IUniVaultStorageV1.sol
diff --git a/src/interface/IUniVaultV1.sol b/src/uniV3/interface/IUniVaultV1.sol
similarity index 100%
rename from src/interface/IUniVaultV1.sol
rename to src/uniV3/interface/IUniVaultV1.sol
diff --git a/src/interface/IUniVaultV2.sol b/src/uniV3/interface/IUniVaultV2.sol
similarity index 100%
rename from src/interface/IUniVaultV2.sol
rename to src/uniV3/interface/IUniVaultV2.sol
diff --git a/src/interface/IUniversalLiquidator.sol b/src/uniV3/interface/IUniversalLiquidator.sol
similarity index 100%
rename from src/interface/IUniversalLiquidator.sol
rename to src/uniV3/interface/IUniversalLiquidator.sol
diff --git a/src/interface/IUniversalLiquidatorRegistry.sol b/src/uniV3/interface/IUniversalLiquidatorRegistry.sol
similarity index 100%
rename from src/interface/IUniversalLiquidatorRegistry.sol
rename to src/uniV3/interface/IUniversalLiquidatorRegistry.sol
diff --git a/src/interface/WETH9.sol b/src/uniV3/interface/WETH9.sol
similarity index 100%
rename from src/interface/WETH9.sol
rename to src/uniV3/interface/WETH9.sol
diff --git a/src/interface/oracle/IDexPriceAggregator.sol b/src/uniV3/interface/oracle/IDexPriceAggregator.sol
similarity index 100%
rename from src/interface/oracle/IDexPriceAggregator.sol
rename to src/uniV3/interface/oracle/IDexPriceAggregator.sol
diff --git a/src/interface/uniswap/IUniswapV3Pool.sol b/src/uniV3/interface/uniswap/IUniswapV3Pool.sol
similarity index 100%
rename from src/interface/uniswap/IUniswapV3Pool.sol
rename to src/uniV3/interface/uniswap/IUniswapV3Pool.sol
diff --git a/src/interface/uniswap/IUniswapV3Staker.sol b/src/uniV3/interface/uniswap/IUniswapV3Staker.sol
similarity index 100%
rename from src/interface/uniswap/IUniswapV3Staker.sol
rename to src/uniV3/interface/uniswap/IUniswapV3Staker.sol
diff --git a/src/interface/uniswapV2/IUniswapV2Factory.sol b/src/uniV3/interface/uniswapV2/IUniswapV2Factory.sol
similarity index 100%
rename from src/interface/uniswapV2/IUniswapV2Factory.sol
rename to src/uniV3/interface/uniswapV2/IUniswapV2Factory.sol
diff --git a/src/interface/uniswapV2/IUniswapV2Migrator.sol b/src/uniV3/interface/uniswapV2/IUniswapV2Migrator.sol
similarity index 100%
rename from src/interface/uniswapV2/IUniswapV2Migrator.sol
rename to src/uniV3/interface/uniswapV2/IUniswapV2Migrator.sol
diff --git a/src/interface/uniswapV2/IUniswapV2Pair.sol b/src/uniV3/interface/uniswapV2/IUniswapV2Pair.sol
similarity index 100%
rename from src/interface/uniswapV2/IUniswapV2Pair.sol
rename to src/uniV3/interface/uniswapV2/IUniswapV2Pair.sol
diff --git a/src/interface/uniswapV2/IUniswapV2Router01.sol b/src/uniV3/interface/uniswapV2/IUniswapV2Router01.sol
similarity index 100%
rename from src/interface/uniswapV2/IUniswapV2Router01.sol
rename to src/uniV3/interface/uniswapV2/IUniswapV2Router01.sol
diff --git a/src/interface/uniswapV2/IUniswapV2Router02.sol b/src/uniV3/interface/uniswapV2/IUniswapV2Router02.sol
similarity index 100%
rename from src/interface/uniswapV2/IUniswapV2Router02.sol
rename to src/uniV3/interface/uniswapV2/IUniswapV2Router02.sol
diff --git a/src/lib/BytesLib.sol b/src/uniV3/lib/BytesLib.sol
similarity index 100%
rename from src/lib/BytesLib.sol
rename to src/uniV3/lib/BytesLib.sol
diff --git a/src/mock/BoredSwapper.sol b/src/uniV3/mock/BoredSwapper.sol
similarity index 100%
rename from src/mock/BoredSwapper.sol
rename to src/uniV3/mock/BoredSwapper.sol
diff --git a/src/mock/PositionMinter.sol b/src/uniV3/mock/PositionMinter.sol
similarity index 100%
rename from src/mock/PositionMinter.sol
rename to src/uniV3/mock/PositionMinter.sol
diff --git a/src/mock/UniVaultSubModuleDepsoitV1Debug.sol b/src/uniV3/mock/UniVaultSubModuleDepsoitV1Debug.sol
similarity index 100%
rename from src/mock/UniVaultSubModuleDepsoitV1Debug.sol
rename to src/uniV3/mock/UniVaultSubModuleDepsoitV1Debug.sol
diff --git a/src/mock/UniVaultUpgradeableV1Debug.sol b/src/uniV3/mock/UniVaultUpgradeableV1Debug.sol
similarity index 100%
rename from src/mock/UniVaultUpgradeableV1Debug.sol
rename to src/uniV3/mock/UniVaultUpgradeableV1Debug.sol
diff --git a/src/mock/ZapDebug.sol b/src/uniV3/mock/ZapDebug.sol
similarity index 100%
rename from src/mock/ZapDebug.sol
rename to src/uniV3/mock/ZapDebug.sol
diff --git a/src/submodules/UniVaultSubModuleChangeRangeV1.sol b/src/uniV3/submodules/UniVaultSubModuleChangeRangeV1.sol
similarity index 100%
rename from src/submodules/UniVaultSubModuleChangeRangeV1.sol
rename to src/uniV3/submodules/UniVaultSubModuleChangeRangeV1.sol
diff --git a/src/submodules/UniVaultSubModuleChangeRangeV2Managed.sol b/src/uniV3/submodules/UniVaultSubModuleChangeRangeV2Managed.sol
similarity index 100%
rename from src/submodules/UniVaultSubModuleChangeRangeV2Managed.sol
rename to src/uniV3/submodules/UniVaultSubModuleChangeRangeV2Managed.sol
diff --git a/src/submodules/UniVaultSubModuleDepositV1.sol b/src/uniV3/submodules/UniVaultSubModuleDepositV1.sol
similarity index 100%
rename from src/submodules/UniVaultSubModuleDepositV1.sol
rename to src/uniV3/submodules/UniVaultSubModuleDepositV1.sol
diff --git a/src/submodules/UniVaultSubModuleDepositV2Managed.sol b/src/uniV3/submodules/UniVaultSubModuleDepositV2Managed.sol
similarity index 100%
rename from src/submodules/UniVaultSubModuleDepositV2Managed.sol
rename to src/uniV3/submodules/UniVaultSubModuleDepositV2Managed.sol
diff --git a/src/submodules/UniVaultSubmoduleRewardV1LiquidateOnly.sol b/src/uniV3/submodules/UniVaultSubmoduleRewardV1LiquidateOnly.sol
similarity index 100%
rename from src/submodules/UniVaultSubmoduleRewardV1LiquidateOnly.sol
rename to src/uniV3/submodules/UniVaultSubmoduleRewardV1LiquidateOnly.sol
diff --git a/src/submodules/interface/IUniStatusViewer.sol b/src/uniV3/submodules/interface/IUniStatusViewer.sol
similarity index 100%
rename from src/submodules/interface/IUniStatusViewer.sol
rename to src/uniV3/submodules/interface/IUniStatusViewer.sol
diff --git a/src/submodules/interface/IUniVaultSubmoduleChangeRangeV1.sol b/src/uniV3/submodules/interface/IUniVaultSubmoduleChangeRangeV1.sol
similarity index 100%
rename from src/submodules/interface/IUniVaultSubmoduleChangeRangeV1.sol
rename to src/uniV3/submodules/interface/IUniVaultSubmoduleChangeRangeV1.sol
diff --git a/src/submodules/interface/IUniVaultSubmoduleChangeRangeV2Managed.sol b/src/uniV3/submodules/interface/IUniVaultSubmoduleChangeRangeV2Managed.sol
similarity index 100%
rename from src/submodules/interface/IUniVaultSubmoduleChangeRangeV2Managed.sol
rename to src/uniV3/submodules/interface/IUniVaultSubmoduleChangeRangeV2Managed.sol
diff --git a/src/submodules/interface/IUniVaultSubmoduleDepositV1.sol b/src/uniV3/submodules/interface/IUniVaultSubmoduleDepositV1.sol
similarity index 100%
rename from src/submodules/interface/IUniVaultSubmoduleDepositV1.sol
rename to src/uniV3/submodules/interface/IUniVaultSubmoduleDepositV1.sol
diff --git a/src/submodules/interface/IUniVaultSubmoduleDepositV2.sol b/src/uniV3/submodules/interface/IUniVaultSubmoduleDepositV2.sol
similarity index 100%
rename from src/submodules/interface/IUniVaultSubmoduleDepositV2.sol
rename to src/uniV3/submodules/interface/IUniVaultSubmoduleDepositV2.sol
diff --git a/src/submodules/interface/IUniVaultSubmoduleRewardV1LiquidateOnly.sol b/src/uniV3/submodules/interface/IUniVaultSubmoduleRewardV1LiquidateOnly.sol
similarity index 100%
rename from src/submodules/interface/IUniVaultSubmoduleRewardV1LiquidateOnly.sol
rename to src/uniV3/submodules/interface/IUniVaultSubmoduleRewardV1LiquidateOnly.sol
diff --git a/src/utility/UniVaultUpgradeableV1SoleLPqfCR.sol b/src/uniV3/utility/UniVaultUpgradeableV1SoleLPqfCR.sol
similarity index 100%
rename from src/utility/UniVaultUpgradeableV1SoleLPqfCR.sol
rename to src/uniV3/utility/UniVaultUpgradeableV1SoleLPqfCR.sol
diff --git a/src/utility/UniVaultUpgradeableV1qfCR.sol b/src/uniV3/utility/UniVaultUpgradeableV1qfCR.sol
similarity index 100%
rename from src/utility/UniVaultUpgradeableV1qfCR.sol
rename to src/uniV3/utility/UniVaultUpgradeableV1qfCR.sol