diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
index 7a1586d38..567cfb72b 100644
--- a/.forge-snapshots/add liquidity to already existing position with salt.snap	
+++ b/.forge-snapshots/add liquidity to already existing position with salt.snap	
@@ -1 +1 @@
-144651
\ No newline at end of file
+144639
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
index 25b3f6d86..13f0d90d7 100644
--- a/.forge-snapshots/addLiquidity CA fee.snap	
+++ b/.forge-snapshots/addLiquidity CA fee.snap	
@@ -1 +1 @@
-170947
\ No newline at end of file
+170935
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
index a5f14cb49..ec66eb5f5 100644
--- a/.forge-snapshots/addLiquidity with empty hook.snap	
+++ b/.forge-snapshots/addLiquidity with empty hook.snap	
@@ -1 +1 @@
-274218
\ No newline at end of file
+274206
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
index a7684fdf5..5c4d0bea7 100644
--- a/.forge-snapshots/addLiquidity with native token.snap	
+++ b/.forge-snapshots/addLiquidity with native token.snap	
@@ -1 +1 @@
-135141
\ No newline at end of file
+135129
\ No newline at end of file
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
index cfd48079e..521237ab9 100644
--- a/.forge-snapshots/create new liquidity to a position with salt.snap	
+++ b/.forge-snapshots/create new liquidity to a position with salt.snap	
@@ -1 +1 @@
-292843
\ No newline at end of file
+292831
\ No newline at end of file
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
index f2a99d3bb..a54ba22c4 100644
--- a/.forge-snapshots/donate gas with 1 token.snap	
+++ b/.forge-snapshots/donate gas with 1 token.snap	
@@ -1 +1 @@
-106333
\ No newline at end of file
+106321
\ No newline at end of file
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
index 81e2b0d13..b5e007e06 100644
--- a/.forge-snapshots/donate gas with 2 tokens.snap	
+++ b/.forge-snapshots/donate gas with 2 tokens.snap	
@@ -1 +1 @@
-145754
\ No newline at end of file
+145742
\ No newline at end of file
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
index c9e91716c..3568d3ea6 100644
--- a/.forge-snapshots/initialize.snap
+++ b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-60025
\ No newline at end of file
+60013
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
index ec2dbf546..141f3ac98 100644
--- a/.forge-snapshots/removeLiquidity CA fee.snap	
+++ b/.forge-snapshots/removeLiquidity CA fee.snap	
@@ -1 +1 @@
-141229
\ No newline at end of file
+141217
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
index 12528ddad..b9000fe01 100644
--- a/.forge-snapshots/removeLiquidity with empty hook.snap	
+++ b/.forge-snapshots/removeLiquidity with empty hook.snap	
@@ -1 +1 @@
-130597
\ No newline at end of file
+130585
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
index 35f7a9f26..8e41d5a6a 100644
--- a/.forge-snapshots/removeLiquidity with native token.snap	
+++ b/.forge-snapshots/removeLiquidity with native token.snap	
@@ -1 +1 @@
-112535
\ No newline at end of file
+112525
\ No newline at end of file
diff --git a/.forge-snapshots/simple addLiquidity second addition same range.snap b/.forge-snapshots/simple addLiquidity second addition same range.snap
index d3a590e01..8d0e2523f 100644
--- a/.forge-snapshots/simple addLiquidity second addition same range.snap	
+++ b/.forge-snapshots/simple addLiquidity second addition same range.snap	
@@ -1 +1 @@
-98850
\ No newline at end of file
+98838
\ No newline at end of file
diff --git a/.forge-snapshots/simple addLiquidity.snap b/.forge-snapshots/simple addLiquidity.snap
index 216625993..2ac3df3f0 100644
--- a/.forge-snapshots/simple addLiquidity.snap	
+++ b/.forge-snapshots/simple addLiquidity.snap	
@@ -1 +1 @@
-161395
\ No newline at end of file
+161383
\ No newline at end of file
diff --git a/.forge-snapshots/simple removeLiquidity some liquidity remains.snap b/.forge-snapshots/simple removeLiquidity some liquidity remains.snap
index c2a4006d2..b3bbea3f2 100644
--- a/.forge-snapshots/simple removeLiquidity some liquidity remains.snap	
+++ b/.forge-snapshots/simple removeLiquidity some liquidity remains.snap	
@@ -1 +1 @@
-92983
\ No newline at end of file
+92971
\ No newline at end of file
diff --git a/.forge-snapshots/simple removeLiquidity.snap b/.forge-snapshots/simple removeLiquidity.snap
index 81dfb1045..d8fffba4e 100644
--- a/.forge-snapshots/simple removeLiquidity.snap	
+++ b/.forge-snapshots/simple removeLiquidity.snap	
@@ -1 +1 @@
-85096
\ No newline at end of file
+85084
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
index 4bf8e4447..f7a10cf66 100644
--- a/.forge-snapshots/simple swap with native.snap	
+++ b/.forge-snapshots/simple swap with native.snap	
@@ -1 +1 @@
-108515
\ No newline at end of file
+108503
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
index 71f991199..98a88b74c 100644
--- a/.forge-snapshots/simple swap.snap	
+++ b/.forge-snapshots/simple swap.snap	
@@ -1 +1 @@
-123335
\ No newline at end of file
+123323
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA custom curve + swap noop.snap b/.forge-snapshots/swap CA custom curve + swap noop.snap
index 2bae0f8b5..1cbd474c9 100644
--- a/.forge-snapshots/swap CA custom curve + swap noop.snap	
+++ b/.forge-snapshots/swap CA custom curve + swap noop.snap	
@@ -1 +1 @@
-124663
\ No newline at end of file
+124651
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
index 0e69c9078..6cc8394ff 100644
--- a/.forge-snapshots/swap CA fee on unspecified.snap	
+++ b/.forge-snapshots/swap CA fee on unspecified.snap	
@@ -1 +1 @@
-154783
\ No newline at end of file
+154771
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
index 24cd0f5c3..f40f02cd3 100644
--- a/.forge-snapshots/swap against liquidity with native token.snap	
+++ b/.forge-snapshots/swap against liquidity with native token.snap	
@@ -1 +1 @@
-105637
\ No newline at end of file
+105625
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
index 5cf1c8096..414122f63 100644
--- a/.forge-snapshots/swap against liquidity.snap	
+++ b/.forge-snapshots/swap against liquidity.snap	
@@ -1 +1 @@
-116705
\ No newline at end of file
+116693
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
index 9f63f70cf..c9fc24b91 100644
--- a/.forge-snapshots/swap burn 6909 for input.snap	
+++ b/.forge-snapshots/swap burn 6909 for input.snap	
@@ -1 +1 @@
-129269
\ No newline at end of file
+129257
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
index 4b0be0884..44d846156 100644
--- a/.forge-snapshots/swap burn native 6909 for input.snap	
+++ b/.forge-snapshots/swap burn native 6909 for input.snap	
@@ -1 +1 @@
-118725
\ No newline at end of file
+118713
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
index 63a0a75cf..7cea3658b 100644
--- a/.forge-snapshots/swap mint native output as 6909.snap	
+++ b/.forge-snapshots/swap mint native output as 6909.snap	
@@ -1 +1 @@
-139747
\ No newline at end of file
+139735
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
index fb2c12b45..f24b9c4e7 100644
--- a/.forge-snapshots/swap mint output as 6909.snap	
+++ b/.forge-snapshots/swap mint output as 6909.snap	
@@ -1 +1 @@
-155176
\ No newline at end of file
+155164
\ No newline at end of file
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
index 9ffba8461..2d821ebed 100644
--- a/.forge-snapshots/swap skips hook call if hook is caller.snap	
+++ b/.forge-snapshots/swap skips hook call if hook is caller.snap	
@@ -1 +1 @@
-206425
\ No newline at end of file
+206437
\ No newline at end of file
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
index 7e8319d12..feaacc0ab 100644
--- a/.forge-snapshots/swap with dynamic fee.snap	
+++ b/.forge-snapshots/swap with dynamic fee.snap	
@@ -1 +1 @@
-139356
\ No newline at end of file
+139368
\ No newline at end of file
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
index a7fd1c54a..d5d13a6c4 100644
--- a/.forge-snapshots/swap with hooks.snap	
+++ b/.forge-snapshots/swap with hooks.snap	
@@ -1 +1 @@
-132343
\ No newline at end of file
+132331
\ No newline at end of file
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
index 8bf4f1a5f..99b68fd83 100644
--- a/.forge-snapshots/swap with lp fee and protocol fee.snap	
+++ b/.forge-snapshots/swap with lp fee and protocol fee.snap	
@@ -1 +1 @@
-169603
\ No newline at end of file
+169615
\ No newline at end of file
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
index 8e88648ff..fb03eaeca 100644
--- a/.forge-snapshots/swap with return dynamic fee.snap	
+++ b/.forge-snapshots/swap with return dynamic fee.snap	
@@ -1 +1 @@
-145683
\ No newline at end of file
+145695
\ No newline at end of file
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
index 0422eb27f..195a70586 100644
--- a/.forge-snapshots/update dynamic fee in before swap.snap	
+++ b/.forge-snapshots/update dynamic fee in before swap.snap	
@@ -1 +1 @@
-147966
\ No newline at end of file
+147978
\ No newline at end of file
diff --git a/README.md b/README.md
index 78788f033..53abf7601 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ If you’re interested in contributing please see our [contribution guidelines](
 
 ## Whitepaper
 
-A more detailed description of Uniswap v4 Core can be found in the draft of the [Uniswap v4 Core Whitepaper](./docs/whitepaper-v4.pdf).
+A more detailed description of Uniswap v4 Core can be found in the draft of the [Uniswap v4 Core Whitepaper](./docs/whitepaper/whitepaper-v4.pdf).
 
 ## Architecture