diff --git a/test/BitMath.t.sol b/test/libraries/BitMath.t.sol
similarity index 98%
rename from test/BitMath.t.sol
rename to test/libraries/BitMath.t.sol
index 6605719a6..e28fc2335 100644
--- a/test/BitMath.t.sol
+++ b/test/libraries/BitMath.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 import {Test} from "forge-std/Test.sol";
-import {BitMath} from "../src/libraries/BitMath.sol";
+import {BitMath} from "src/libraries/BitMath.sol";
 
 contract TestBitMath is Test, GasSnapshot {
     function testMostSignificantBitZero() public {
diff --git a/test/FullMath.t.sol b/test/libraries/FullMath.t.sol
similarity index 99%
rename from test/FullMath.t.sol
rename to test/libraries/FullMath.t.sol
index 96f4a8078..b7b311910 100644
--- a/test/FullMath.t.sol
+++ b/test/libraries/FullMath.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {Test} from "forge-std/Test.sol";
-import {FullMath} from "../src/libraries/FullMath.sol";
+import {FullMath} from "src/libraries/FullMath.sol";
 
 contract FullMathTest is Test {
     using FullMath for uint256;
diff --git a/test/Hooks.t.sol b/test/libraries/Hooks.t.sol
similarity index 97%
rename from test/Hooks.t.sol
rename to test/libraries/Hooks.t.sol
index 8205aff62..2dc57cc12 100644
--- a/test/Hooks.t.sol
+++ b/test/libraries/Hooks.t.sol
@@ -4,22 +4,22 @@ pragma solidity ^0.8.20;
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {Hooks} from "../src/libraries/Hooks.sol";
-import {SwapFeeLibrary} from "../src/libraries/SwapFeeLibrary.sol";
-import {MockHooks} from "../src/test/MockHooks.sol";
-import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
+import {Hooks} from "src/libraries/Hooks.sol";
+import {SwapFeeLibrary} from "src/libraries/SwapFeeLibrary.sol";
+import {MockHooks} from "src/test/MockHooks.sol";
+import {IPoolManager} from "src/interfaces/IPoolManager.sol";
 import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
-import {IHooks} from "../src/interfaces/IHooks.sol";
-import {Currency} from "../src/types/Currency.sol";
-import {PoolManager} from "../src/PoolManager.sol";
-import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
-import {PoolDonateTest} from "../src/test/PoolDonateTest.sol";
-import {Deployers} from "./utils/Deployers.sol";
-import {ProtocolFees} from "../src/ProtocolFees.sol";
-import {PoolId, PoolIdLibrary} from "../src/types/PoolId.sol";
-import {PoolKey} from "../src/types/PoolKey.sol";
-import {IERC20Minimal} from "../src/interfaces/external/IERC20Minimal.sol";
-import {BalanceDelta} from "../src/types/BalanceDelta.sol";
+import {IHooks} from "src/interfaces/IHooks.sol";
+import {Currency} from "src/types/Currency.sol";
+import {PoolManager} from "src/PoolManager.sol";
+import {PoolSwapTest} from "src/test/PoolSwapTest.sol";
+import {PoolDonateTest} from "src/test/PoolDonateTest.sol";
+import {Deployers} from "test/utils/Deployers.sol";
+import {ProtocolFees} from "src/ProtocolFees.sol";
+import {PoolId, PoolIdLibrary} from "src/types/PoolId.sol";
+import {PoolKey} from "src/types/PoolKey.sol";
+import {IERC20Minimal} from "src/interfaces/external/IERC20Minimal.sol";
+import {BalanceDelta} from "src/types/BalanceDelta.sol";
 
 contract HooksTest is Test, Deployers, GasSnapshot {
     using PoolIdLibrary for PoolKey;
diff --git a/test/Lock.t.sol b/test/libraries/Lock.t.sol
similarity index 87%
rename from test/Lock.t.sol
rename to test/libraries/Lock.t.sol
index a5a8b7466..9fa8b126b 100644
--- a/test/Lock.t.sol
+++ b/test/libraries/Lock.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
-import {Lock} from "../src/libraries/Lock.sol";
+import {Lock} from "src/libraries/Lock.sol";
 
 contract LockTest is Test {
     function test_lock() public {
diff --git a/test/NonZeroDeltaCount.t.sol b/test/libraries/NonZeroDeltaCount.t.sol
similarity index 94%
rename from test/NonZeroDeltaCount.t.sol
rename to test/libraries/NonZeroDeltaCount.t.sol
index 9f37f5ce0..5dbcf34b0 100644
--- a/test/NonZeroDeltaCount.t.sol
+++ b/test/libraries/NonZeroDeltaCount.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
-import {NonZeroDeltaCount} from "../src/libraries/NonZeroDeltaCount.sol";
+import {NonZeroDeltaCount} from "src/libraries/NonZeroDeltaCount.sol";
 
 contract NonZeroDeltaCountTest is Test {
     address constant ADDRESS_AS = 0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa;
diff --git a/test/Pool.t.sol b/test/libraries/Pool.t.sol
similarity index 92%
rename from test/Pool.t.sol
rename to test/libraries/Pool.t.sol
index c99e1d8b2..6874038a1 100644
--- a/test/Pool.t.sol
+++ b/test/libraries/Pool.t.sol
@@ -3,14 +3,14 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {Pool} from "../src/libraries/Pool.sol";
-import {PoolManager} from "../src/PoolManager.sol";
-import {Position} from "../src/libraries/Position.sol";
-import {TickMath} from "../src/libraries/TickMath.sol";
-import {TickBitmap} from "../src/libraries/TickBitmap.sol";
-import {LiquidityAmounts} from "./utils/LiquidityAmounts.sol";
-import {Constants} from "./utils/Constants.sol";
-import {SafeCast} from "../src/libraries/SafeCast.sol";
+import {Pool} from "src/libraries/Pool.sol";
+import {PoolManager} from "src/PoolManager.sol";
+import {Position} from "src/libraries/Position.sol";
+import {TickMath} from "src/libraries/TickMath.sol";
+import {TickBitmap} from "src/libraries/TickBitmap.sol";
+import {LiquidityAmounts} from "test/utils/LiquidityAmounts.sol";
+import {Constants} from "test/utils/Constants.sol";
+import {SafeCast} from "src/libraries/SafeCast.sol";
 
 contract PoolTest is Test {
     using Pool for Pool.State;
diff --git a/test/SafeCast.t.sol b/test/libraries/SafeCast.t.sol
similarity index 95%
rename from test/SafeCast.t.sol
rename to test/libraries/SafeCast.t.sol
index a0e0b6a98..fe48148a9 100644
--- a/test/SafeCast.t.sol
+++ b/test/libraries/SafeCast.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {SafeCast} from "../src/libraries/SafeCast.sol";
+import {SafeCast} from "src/libraries/SafeCast.sol";
 
 contract SafeCastTest is Test {
     function testToUint160(uint256 x) public {
diff --git a/test/SqrtPriceMath.t.sol b/test/libraries/SqrtPriceMath.t.sol
similarity index 98%
rename from test/SqrtPriceMath.t.sol
rename to test/libraries/SqrtPriceMath.t.sol
index cb63d0cbf..9e49bedee 100644
--- a/test/SqrtPriceMath.t.sol
+++ b/test/libraries/SqrtPriceMath.t.sol
@@ -4,9 +4,9 @@ pragma solidity ^0.8.20;
 import "forge-std/console.sol";
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {GasSnapshot} from "../lib/forge-gas-snapshot/src/GasSnapshot.sol";
-import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol";
-import {Constants} from "./utils/Constants.sol";
+import {GasSnapshot} from "lib/forge-gas-snapshot/src/GasSnapshot.sol";
+import {SqrtPriceMath} from "src/libraries/SqrtPriceMath.sol";
+import {Constants} from "test/utils/Constants.sol";
 
 contract SqrtPriceMathTestTest is Test, GasSnapshot {
     function test_getNextSqrtPriceFromInput_revertsIfPriceIsZero() public {
diff --git a/test/SwapMath.t.sol b/test/libraries/SwapMath.t.sol
similarity index 98%
rename from test/SwapMath.t.sol
rename to test/libraries/SwapMath.t.sol
index ebabd5da6..2c17f41f6 100644
--- a/test/SwapMath.t.sol
+++ b/test/libraries/SwapMath.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {SqrtPriceMath} from "../src/libraries/SqrtPriceMath.sol";
-import {SwapMath} from "../src/libraries/SwapMath.sol";
+import {SqrtPriceMath} from "src/libraries/SqrtPriceMath.sol";
+import {SwapMath} from "src/libraries/SwapMath.sol";
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 
 contract SwapMathTest is Test, GasSnapshot {
diff --git a/test/TickBitmap.t.sol b/test/libraries/TickBitmap.t.sol
similarity index 98%
rename from test/TickBitmap.t.sol
rename to test/libraries/TickBitmap.t.sol
index fb8feac8c..d91ce277f 100644
--- a/test/TickBitmap.t.sol
+++ b/test/libraries/TickBitmap.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {GasSnapshot} from "../lib/forge-gas-snapshot/src/GasSnapshot.sol";
-import {TickBitmap} from "../src/libraries/TickBitmap.sol";
+import {GasSnapshot} from "lib/forge-gas-snapshot/src/GasSnapshot.sol";
+import {TickBitmap} from "src/libraries/TickBitmap.sol";
 
 contract TickBitmapTest is Test, GasSnapshot {
     using TickBitmap for mapping(int16 => uint256);
diff --git a/test/TickMath.t.sol b/test/libraries/TickMath.t.sol
similarity index 97%
rename from test/TickMath.t.sol
rename to test/libraries/TickMath.t.sol
index 9817918d4..5e387dd36 100644
--- a/test/TickMath.t.sol
+++ b/test/libraries/TickMath.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {TickMathTest} from "../src/test/TickMathTest.sol";
-import {TickMath} from "../src/libraries/TickMath.sol";
-import {JavascriptFfi} from "./utils/JavascriptFfi.sol";
+import {TickMathTest} from "src/test/TickMathTest.sol";
+import {TickMath} from "src/libraries/TickMath.sol";
+import {JavascriptFfi} from "test/utils/JavascriptFfi.sol";
 
 contract TickMathTestTest is Test, JavascriptFfi {
     int24 constant MIN_TICK = -887272;
diff --git a/test/NestedActions.t.sol b/test/utils/NestedActions.t.sol
similarity index 88%
rename from test/NestedActions.t.sol
rename to test/utils/NestedActions.t.sol
index 8e1848afe..78eee0836 100644
--- a/test/NestedActions.t.sol
+++ b/test/utils/NestedActions.t.sol
@@ -2,10 +2,10 @@
 pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
-import {Deployers} from "./utils/Deployers.sol";
+import {Deployers} from "test/utils/Deployers.sol";
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
-import {Action} from "../src/test/PoolNestedActionsTest.sol";
-import {IHooks} from "../src/interfaces/IHooks.sol";
+import {Action} from "src/test/PoolNestedActionsTest.sol";
+import {IHooks} from "src/interfaces/IHooks.sol";
 
 contract NestedActions is Test, Deployers, GasSnapshot {
     Action[] actions;