diff --git a/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol b/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol
index bb770a84..a2b1636a 100644
--- a/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol
+++ b/test/foundry-tests/integration/RelayOrderReactorIntegration.t.sol
@@ -5,21 +5,21 @@ import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
 import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {Test, stdJson} from "forge-std/Test.sol";
+import {AddressBuilder} from "permit2/test/utils/AddressBuilder.sol";
+import {AmountBuilder} from "permit2/test/utils/AmountBuilder.sol";
+import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
 import {IPermit2} from "permit2/src/interfaces/IPermit2.sol";
 import {SignedOrder} from "UniswapX/src/base/ReactorStructs.sol";
 import {OrderInfoBuilder} from "UniswapX/test/util/OrderInfoBuilder.sol";
 import {ArrayBuilder} from "UniswapX/test/util/ArrayBuilder.sol";
 import {CurrencyLibrary} from "UniswapX/src/lib/CurrencyLibrary.sol";
 import {Input, OrderInfo} from "../../../src/base/ReactorStructs.sol";
-import {IRelayOrderReactor} from "../../../src/interfaces/IRelayOrderReactor.sol";
 import {ReactorEvents} from "../../../src/base/ReactorEvents.sol";
-import {PermitSignature} from "../util/PermitSignature.sol";
-import {RelayOrderLib, RelayOrder} from "../../../src/lib/RelayOrderLib.sol";
+import {IRelayOrderReactor} from "../../../src/interfaces/IRelayOrderReactor.sol";
 import {RelayOrderReactor} from "../../../src/reactors/RelayOrderReactor.sol";
+import {RelayOrderLib, RelayOrder} from "../../../src/lib/RelayOrderLib.sol";
+import {PermitSignature} from "../util/PermitSignature.sol";
 import {MethodParameters, Interop} from "../util/Interop.sol";
-import {AddressBuilder} from "permit2/test/utils/AddressBuilder.sol";
-import {AmountBuilder} from "permit2/test/utils/AmountBuilder.sol";
-import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
 
 contract RelayOrderReactorIntegrationTest is GasSnapshot, Test, Interop, PermitSignature {
     using stdJson for string;
diff --git a/test/foundry-tests/RelayOrderQuoter.t.sol b/test/foundry-tests/lens/RelayOrderQuoter.t.sol
similarity index 95%
rename from test/foundry-tests/RelayOrderQuoter.t.sol
rename to test/foundry-tests/lens/RelayOrderQuoter.t.sol
index f220da1c..3ec235a5 100644
--- a/test/foundry-tests/RelayOrderQuoter.t.sol
+++ b/test/foundry-tests/lens/RelayOrderQuoter.t.sol
@@ -2,22 +2,19 @@
 pragma solidity ^0.8.0;
 
 import {Test} from "forge-std/Test.sol";
-import {RelayOrderQuoter} from "../../src/lens/RelayOrderQuoter.sol";
-import {RelayOrder, ResolvedInput} from "../../src/base/ReactorStructs.sol";
-import {IRelayOrderReactor} from "../../src/interfaces/IRelayOrderReactor.sol";
-import {OrderInfo} from "../../src/base/ReactorStructs.sol";
-import {Input} from "../../src/base/ReactorStructs.sol";
-import {MockERC20} from "./util/mock/MockERC20.sol";
 import {IPermit2} from "permit2/src/interfaces/IPermit2.sol";
-import {DeployPermit2} from "UniswapX/test/util/DeployPermit2.sol";
-import {IRelayOrderReactor} from "../../src/interfaces/IRelayOrderReactor.sol";
-import {PermitSignature} from "./util/PermitSignature.sol";
-import {RelayOrderReactor} from "../../src/reactors/RelayOrderReactor.sol";
-import {ReactorErrors} from "../../src/base/ReactorErrors.sol";
-import {MockUniversalRouter} from "./util/mock/MockUniversalRouter.sol";
 import {SignatureVerification} from "permit2/src/libraries/SignatureVerification.sol";
+import {DeployPermit2} from "UniswapX/test/util/DeployPermit2.sol";
 import {SignedOrder} from "UniswapX/src/base/ReactorStructs.sol";
-import {IMulticall} from "../../src/interfaces/IMulticall.sol";
+import {RelayOrderReactor} from "../../../src/reactors/RelayOrderReactor.sol";
+import {RelayOrderQuoter} from "../../../src/lens/RelayOrderQuoter.sol";
+import {Input, OrderInfo, RelayOrder, ResolvedInput} from "../../../src/base/ReactorStructs.sol";
+import {ReactorErrors} from "../../../src/base/ReactorErrors.sol";
+import {IRelayOrderReactor} from "../../../src/interfaces/IRelayOrderReactor.sol";
+import {IMulticall} from "../../../src/interfaces/IMulticall.sol";
+import {PermitSignature} from "../util/PermitSignature.sol";
+import {MockUniversalRouter} from "../util/mock/MockUniversalRouter.sol";
+import {MockERC20} from "../util/mock/MockERC20.sol";
 
 contract RelayOrderQuoterTest is Test, PermitSignature, DeployPermit2 {
     RelayOrderQuoter quoter;
diff --git a/test/foundry-tests/reactors/RelayOrderReactorTest.t.sol b/test/foundry-tests/reactors/RelayOrderReactorTest.t.sol
index aef36cda..a9ec9e55 100644
--- a/test/foundry-tests/reactors/RelayOrderReactorTest.t.sol
+++ b/test/foundry-tests/reactors/RelayOrderReactorTest.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 import {Test} from "forge-std/Test.sol";
-import {SignedOrder} from "UniswapX/src/base/ReactorStructs.sol";
 import {IPermit2} from "permit2/src/interfaces/IPermit2.sol";
+import {SignedOrder} from "UniswapX/src/base/ReactorStructs.sol";
 import {DeployPermit2} from "UniswapX/test/util/DeployPermit2.sol";
 import {MockERC20} from "UniswapX/test/util/mock/MockERC20.sol";
 import {CurrencyLibrary} from "UniswapX/src/lib/CurrencyLibrary.sol";