diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereum.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereum.t.sol
similarity index 94%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereum.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereum.t.sol
index 127d725b6e..4a1c7375ec 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereum.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereum.t.sol
@@ -5,18 +5,18 @@ import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
 
 import {stdError} from "forge-std/Test.sol";
-import {BaseTest} from "../BaseTest.t.sol";
-import {IPool} from "../../interfaces/pools/IPool.sol";
-import {LockReleaseTokenPool} from "../../pools/LockReleaseTokenPool.sol";
-import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
-import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
-import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
-import {Router} from "../../Router.sol";
-import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
-import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {BaseTest} from "../../BaseTest.t.sol";
+import {IPool} from "../../../interfaces/pools/IPool.sol";
+import {LockReleaseTokenPool} from "../../../pools/LockReleaseTokenPool.sol";
+import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
+import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
+import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
+import {Router} from "../../../Router.sol";
+import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
+import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {GHOTokenPoolEthereumSetup} from "./GHOTokenPoolEthereumSetup.t.sol";
 
 contract GHOTokenPoolEthereum_setRebalancer is GHOTokenPoolEthereumSetup {
diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumE2E.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumE2E.t.sol
similarity index 95%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumE2E.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumE2E.t.sol
index 10eb9e0058..edbe01008d 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumE2E.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumE2E.t.sol
@@ -3,18 +3,18 @@ pragma solidity 0.8.19;
 
 import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 
-import "../helpers/MerkleHelper.sol";
-import "../commitStore/CommitStore.t.sol";
-import "../onRamp/EVM2EVMOnRampSetup.t.sol";
-import "../offRamp/EVM2EVMOffRampSetup.t.sol";
-import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
+import "../../helpers/MerkleHelper.sol";
+import "../../commitStore/CommitStore.t.sol";
+import "../../onRamp/EVM2EVMOnRampSetup.t.sol";
+import "../../offRamp/EVM2EVMOffRampSetup.t.sol";
+import {IBurnMintERC20} from "../../../../shared/token/ERC20/IBurnMintERC20.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
-import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
-import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {IPool} from "../../interfaces/pools/IPool.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
-import {E2E} from "./End2End.t.sol";
+import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
+import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {IPool} from "../../../interfaces/pools/IPool.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
+import {E2E} from "../End2End.t.sol";
 
 contract GHOTokenPoolEthereumE2E is E2E {
   using Internal for Internal.EVM2EVMMessage;
diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumSetup.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumSetup.t.sol
similarity index 75%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumSetup.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumSetup.t.sol
index 3c0c5afe0f..45ea7600c8 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolEthereumSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolEthereumSetup.t.sol
@@ -5,19 +5,19 @@ import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
 
 import {stdError} from "forge-std/Test.sol";
-import {BaseTest} from "../BaseTest.t.sol";
-import {IPool} from "../../interfaces/pools/IPool.sol";
-import {LockReleaseTokenPool} from "../../pools/LockReleaseTokenPool.sol";
-import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
-import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
-import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
-import {Router} from "../../Router.sol";
-import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
-import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
-import {RouterSetup} from "../router/RouterSetup.t.sol";
+import {BaseTest} from "../../BaseTest.t.sol";
+import {IPool} from "../../../interfaces/pools/IPool.sol";
+import {LockReleaseTokenPool} from "../../../pools/LockReleaseTokenPool.sol";
+import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
+import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
+import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
+import {Router} from "../../../Router.sol";
+import {IERC165} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/IERC165.sol";
+import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {RouterSetup} from "../../router/RouterSetup.t.sol";
 
 contract GHOTokenPoolEthereumSetup is RouterSetup {
   IERC20 internal s_token;
diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemote.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemote.t.sol
similarity index 92%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemote.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemote.t.sol
index c0e9775efb..ff796082f5 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemote.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemote.t.sol
@@ -5,14 +5,14 @@ import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
 
 import {stdError} from "forge-std/Test.sol";
-import {BaseTest} from "../BaseTest.t.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
-import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
-import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
-import {BurnMintTokenPool} from "../../pools/BurnMintTokenPool.sol";
-import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
+import {BaseTest} from "../../BaseTest.t.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
+import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
+import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
+import {BurnMintTokenPool} from "../../../pools/BurnMintTokenPool.sol";
+import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
 import {GHOTokenPoolRemoteSetup} from "./GHOTokenPoolRemoteSetup.t.sol";
 
 contract GHOTokenPoolRemote_lockOrBurn is GHOTokenPoolRemoteSetup {
diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteE2E.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteE2E.t.sol
similarity index 95%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteE2E.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteE2E.t.sol
index 99453df873..848ccb1691 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteE2E.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteE2E.t.sol
@@ -3,18 +3,18 @@ pragma solidity 0.8.19;
 
 import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 
-import "../helpers/MerkleHelper.sol";
-import "../commitStore/CommitStore.t.sol";
-import "../onRamp/EVM2EVMOnRampSetup.t.sol";
-import "../offRamp/EVM2EVMOffRampSetup.t.sol";
-import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";
+import "../../helpers/MerkleHelper.sol";
+import "../../commitStore/CommitStore.t.sol";
+import "../../onRamp/EVM2EVMOnRampSetup.t.sol";
+import "../../offRamp/EVM2EVMOffRampSetup.t.sol";
+import {IBurnMintERC20} from "../../../../shared/token/ERC20/IBurnMintERC20.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
-import {UpgradeableLockReleaseTokenPool} from "../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
-import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {IPool} from "../../interfaces/pools/IPool.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
-import {E2E} from "./End2End.t.sol";
+import {UpgradeableLockReleaseTokenPool} from "../../../pools/GHO/UpgradeableLockReleaseTokenPool.sol";
+import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {IPool} from "../../../interfaces/pools/IPool.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
+import {E2E} from "../End2End.t.sol";
 
 contract GHOTokenPoolRemoteE2E is E2E {
   using Internal for Internal.EVM2EVMMessage;
diff --git a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteSetup.t.sol b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteSetup.t.sol
similarity index 85%
rename from contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteSetup.t.sol
rename to contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteSetup.t.sol
index d6e1a1db43..1ad46d7cde 100644
--- a/contracts/src/v0.8/ccip/test/pools/GHOTokenPoolRemoteSetup.t.sol
+++ b/contracts/src/v0.8/ccip/test/pools/GHO/GHOTokenPoolRemoteSetup.t.sol
@@ -5,16 +5,16 @@ import {GhoToken} from "@aave/gho-core/gho/GhoToken.sol";
 import {TransparentUpgradeableProxy} from "solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol";
 
 import {stdError} from "forge-std/Test.sol";
-import {BaseTest} from "../BaseTest.t.sol";
-import {TokenPool} from "../../pools/TokenPool.sol";
-import {Router} from "../../Router.sol";
-import {EVM2EVMOnRamp} from "../../onRamp/EVM2EVMOnRamp.sol";
-import {EVM2EVMOffRamp} from "../../offRamp/EVM2EVMOffRamp.sol";
-import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
-import {BurnMintTokenPool} from "../../pools/BurnMintTokenPool.sol";
-import {UpgradeableBurnMintTokenPool} from "../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
-import {RateLimiter} from "../../libraries/RateLimiter.sol";
-import {RouterSetup} from "../router/RouterSetup.t.sol";
+import {BaseTest} from "../../BaseTest.t.sol";
+import {TokenPool} from "../../../pools/TokenPool.sol";
+import {Router} from "../../../Router.sol";
+import {EVM2EVMOnRamp} from "../../../onRamp/EVM2EVMOnRamp.sol";
+import {EVM2EVMOffRamp} from "../../../offRamp/EVM2EVMOffRamp.sol";
+import {BurnMintERC677} from "../../../../shared/token/ERC677/BurnMintERC677.sol";
+import {BurnMintTokenPool} from "../../../pools/BurnMintTokenPool.sol";
+import {UpgradeableBurnMintTokenPool} from "../../../pools/GHO/UpgradeableBurnMintTokenPool.sol";
+import {RateLimiter} from "../../../libraries/RateLimiter.sol";
+import {RouterSetup} from "../../router/RouterSetup.t.sol";
 
 contract GHOTokenPoolRemoteSetup is RouterSetup {
   event Transfer(address indexed from, address indexed to, uint256 value);