diff --git a/foundry-default.toml b/foundry-default.toml
index cda5e4a..1790f59 100644
--- a/foundry-default.toml
+++ b/foundry-default.toml
@@ -5,11 +5,11 @@ libs = ['lib']
 remappings = [
     '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/',
     # '@uniswap/v3-core/=lib/v3-core/',
-    '@uniswap/v3-core/=lib_sol8/v3-core/',
-    'v3-core/=lib_sol8/v3-core/',
+    '@uniswap/v3-core/=lib_uniswap/v3-core/',
+    'v3-core/=lib_uniswap/v3-core/',
     # '@uniswap/v3-periphery/=lib/v3-periphery/',
-    '@uniswap/v3-periphery/=lib_sol8/v3-periphery/',
-    'v3-periphery/libraries/=lib_sol8/v3-periphery/contracts/libraries',
+    '@uniswap/v3-periphery/=lib_uniswap/v3-periphery/',
+    'v3-periphery/libraries/=lib_uniswap/v3-periphery/contracts/libraries',
 ]
 sizes = true
 gas_reports = ['*']
diff --git a/lib_sol8/v3-core/LICENSE b/lib_uniswap/v3-core/LICENSE
similarity index 100%
rename from lib_sol8/v3-core/LICENSE
rename to lib_uniswap/v3-core/LICENSE
diff --git a/lib_sol8/v3-core/contracts/interfaces/IERC20Minimal.sol b/lib_uniswap/v3-core/contracts/interfaces/IERC20Minimal.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/IERC20Minimal.sol
rename to lib_uniswap/v3-core/contracts/interfaces/IERC20Minimal.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/IUniswapV3Factory.sol b/lib_uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/IUniswapV3Factory.sol
rename to lib_uniswap/v3-core/contracts/interfaces/IUniswapV3Factory.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/IUniswapV3Pool.sol b/lib_uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/IUniswapV3Pool.sol
rename to lib_uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/IUniswapV3PoolDeployer.sol b/lib_uniswap/v3-core/contracts/interfaces/IUniswapV3PoolDeployer.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/IUniswapV3PoolDeployer.sol
rename to lib_uniswap/v3-core/contracts/interfaces/IUniswapV3PoolDeployer.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/LICENSE b/lib_uniswap/v3-core/contracts/interfaces/LICENSE
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/LICENSE
rename to lib_uniswap/v3-core/contracts/interfaces/LICENSE
diff --git a/lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3FlashCallback.sol b/lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3FlashCallback.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3FlashCallback.sol
rename to lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3FlashCallback.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3MintCallback.sol b/lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3MintCallback.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3MintCallback.sol
rename to lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3MintCallback.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol b/lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol
rename to lib_uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolActions.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolActions.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolActions.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolActions.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolDerivedState.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolDerivedState.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolDerivedState.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolDerivedState.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolEvents.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolEvents.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolEvents.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolEvents.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolOwnerActions.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolOwnerActions.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolOwnerActions.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolOwnerActions.sol
diff --git a/lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolState.sol b/lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolState.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/interfaces/pool/IUniswapV3PoolState.sol
rename to lib_uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolState.sol
diff --git a/lib_sol8/v3-core/contracts/libraries/FixedPoint96.sol b/lib_uniswap/v3-core/contracts/libraries/FixedPoint96.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/libraries/FixedPoint96.sol
rename to lib_uniswap/v3-core/contracts/libraries/FixedPoint96.sol
diff --git a/lib_sol8/v3-core/contracts/libraries/FullMath.sol b/lib_uniswap/v3-core/contracts/libraries/FullMath.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/libraries/FullMath.sol
rename to lib_uniswap/v3-core/contracts/libraries/FullMath.sol
diff --git a/lib_sol8/v3-core/contracts/libraries/TickMath.sol b/lib_uniswap/v3-core/contracts/libraries/TickMath.sol
similarity index 100%
rename from lib_sol8/v3-core/contracts/libraries/TickMath.sol
rename to lib_uniswap/v3-core/contracts/libraries/TickMath.sol
diff --git a/lib_sol8/v3-periphery/LICENSE b/lib_uniswap/v3-periphery/LICENSE
similarity index 100%
rename from lib_sol8/v3-periphery/LICENSE
rename to lib_uniswap/v3-periphery/LICENSE
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IERC20Metadata.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IERC20Metadata.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IERC20Metadata.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IERC20Metadata.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IERC721Permit.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IERC721Permit.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IERC721Permit.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IERC721Permit.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IMulticall.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IMulticall.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IMulticall.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IMulticall.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/INonfungiblePositionManager.sol b/lib_uniswap/v3-periphery/contracts/interfaces/INonfungiblePositionManager.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/INonfungiblePositionManager.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/INonfungiblePositionManager.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/INonfungibleTokenPositionDescriptor.sol b/lib_uniswap/v3-periphery/contracts/interfaces/INonfungibleTokenPositionDescriptor.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/INonfungibleTokenPositionDescriptor.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/INonfungibleTokenPositionDescriptor.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryImmutableState.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IPeripheryPayments.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryPayments.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IPeripheryPayments.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryPayments.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IPeripheryPaymentsWithFee.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryPaymentsWithFee.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IPeripheryPaymentsWithFee.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IPeripheryPaymentsWithFee.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IPoolInitializer.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IPoolInitializer.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IPoolInitializer.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IPoolInitializer.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IQuoter.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IQuoter.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IQuoter.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IQuoter.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IQuoterV2.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IQuoterV2.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IQuoterV2.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IQuoterV2.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/ISelfPermit.sol b/lib_uniswap/v3-periphery/contracts/interfaces/ISelfPermit.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/ISelfPermit.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/ISelfPermit.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/ISwapRouter.sol b/lib_uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/ISwapRouter.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/ITickLens.sol b/lib_uniswap/v3-periphery/contracts/interfaces/ITickLens.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/ITickLens.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/ITickLens.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/IV3Migrator.sol b/lib_uniswap/v3-periphery/contracts/interfaces/IV3Migrator.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/IV3Migrator.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/IV3Migrator.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/external/IERC1271.sol b/lib_uniswap/v3-periphery/contracts/interfaces/external/IERC1271.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/external/IERC1271.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/external/IERC1271.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/external/IERC20PermitAllowed.sol b/lib_uniswap/v3-periphery/contracts/interfaces/external/IERC20PermitAllowed.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/external/IERC20PermitAllowed.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/external/IERC20PermitAllowed.sol
diff --git a/lib_sol8/v3-periphery/contracts/interfaces/external/IWETH9.sol b/lib_uniswap/v3-periphery/contracts/interfaces/external/IWETH9.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/interfaces/external/IWETH9.sol
rename to lib_uniswap/v3-periphery/contracts/interfaces/external/IWETH9.sol
diff --git a/lib_sol8/v3-periphery/contracts/libraries/LiquidityAmounts.sol b/lib_uniswap/v3-periphery/contracts/libraries/LiquidityAmounts.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/libraries/LiquidityAmounts.sol
rename to lib_uniswap/v3-periphery/contracts/libraries/LiquidityAmounts.sol
diff --git a/lib_sol8/v3-periphery/contracts/libraries/PoolAddress.sol b/lib_uniswap/v3-periphery/contracts/libraries/PoolAddress.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/libraries/PoolAddress.sol
rename to lib_uniswap/v3-periphery/contracts/libraries/PoolAddress.sol
diff --git a/lib_sol8/v3-periphery/contracts/libraries/TransferHelper.sol b/lib_uniswap/v3-periphery/contracts/libraries/TransferHelper.sol
similarity index 100%
rename from lib_sol8/v3-periphery/contracts/libraries/TransferHelper.sol
rename to lib_uniswap/v3-periphery/contracts/libraries/TransferHelper.sol