diff --git a/packages/contracts-rfq/test/UniversalTokenLibHarness.sol b/packages/contracts-rfq/test/harnesses/UniversalTokenLibHarness.sol
similarity index 93%
rename from packages/contracts-rfq/test/UniversalTokenLibHarness.sol
rename to packages/contracts-rfq/test/harnesses/UniversalTokenLibHarness.sol
index 5e628b5fa2..0b2d2bc234 100644
--- a/packages/contracts-rfq/test/UniversalTokenLibHarness.sol
+++ b/packages/contracts-rfq/test/harnesses/UniversalTokenLibHarness.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {UniversalTokenLib} from "../contracts/libs/UniversalToken.sol";
+import {UniversalTokenLib} from "../../contracts/libs/UniversalToken.sol";
 
 // solhint-disable no-empty-blocks, ordering
 contract UniversalTokenLibHarness {
diff --git a/packages/contracts-rfq/test/UniversalTokenLib.t.sol b/packages/contracts-rfq/test/libs/UniversalTokenLib.t.sol
similarity index 96%
rename from packages/contracts-rfq/test/UniversalTokenLib.t.sol
rename to packages/contracts-rfq/test/libs/UniversalTokenLib.t.sol
index ce46c08b19..8e900e9918 100644
--- a/packages/contracts-rfq/test/UniversalTokenLib.t.sol
+++ b/packages/contracts-rfq/test/libs/UniversalTokenLib.t.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {TokenNotContract} from "../contracts/libs/Errors.sol";
+import {TokenNotContract} from "../../contracts/libs/Errors.sol";
 
-import {MockERC20} from "./MockERC20.sol";
-import {MockRevertingRecipient} from "./MockRevertingRecipient.sol";
-import {UniversalTokenLibHarness} from "./UniversalTokenLibHarness.sol";
+import {UniversalTokenLibHarness} from "../harnesses/UniversalTokenLibHarness.sol";
+import {MockERC20} from "../mocks/MockERC20.sol";
+import {MockRevertingRecipient} from "../mocks/MockRevertingRecipient.sol";
 
 import {Test} from "forge-std/Test.sol";