diff --git a/contracts/crosschain/axelar/AxelarGatewayDestination.sol b/contracts/crosschain/axelar/AxelarGatewayDestination.sol
index 03e60d4a..e88276e6 100644
--- a/contracts/crosschain/axelar/AxelarGatewayDestination.sol
+++ b/contracts/crosschain/axelar/AxelarGatewayDestination.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.27;
 
 import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {IERC7786Receiver} from "../interfaces/draft-IERC7786.sol";
+import {IERC7786Receiver} from "../../interfaces/draft-IERC7786.sol";
 import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
 
 /**
diff --git a/contracts/crosschain/axelar/AxelarGatewaySource.sol b/contracts/crosschain/axelar/AxelarGatewaySource.sol
index 77cdbe80..be43b64b 100644
--- a/contracts/crosschain/axelar/AxelarGatewaySource.sol
+++ b/contracts/crosschain/axelar/AxelarGatewaySource.sol
@@ -6,7 +6,7 @@ import {CAIP2} from "@openzeppelin/contracts/utils/CAIP2.sol";
 import {CAIP10} from "@openzeppelin/contracts/utils/CAIP10.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
-import {IERC7786GatewaySource} from "../interfaces/draft-IERC7786.sol";
+import {IERC7786GatewaySource} from "../../interfaces/draft-IERC7786.sol";
 
 /**
  * @dev Implementation of an ERC-7786 gateway source adapter for the Axelar Network.
diff --git a/contracts/crosschain/utils/draft-ERC7786Receiver.sol b/contracts/crosschain/utils/draft-ERC7786Receiver.sol
index 2a5c276e..5a5136af 100644
--- a/contracts/crosschain/utils/draft-ERC7786Receiver.sol
+++ b/contracts/crosschain/utils/draft-ERC7786Receiver.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.27;
 
-import {IERC7786Receiver} from "../interfaces/draft-IERC7786.sol";
+import {IERC7786Receiver} from "../../interfaces/draft-IERC7786.sol";
 
 /**
  * @dev Base implementation of an ERC-7786 compliant cross-chain message receiver.
diff --git a/contracts/crosschain/interfaces/draft-IERC7786.sol b/contracts/interfaces/draft-IERC7786.sol
similarity index 100%
rename from contracts/crosschain/interfaces/draft-IERC7786.sol
rename to contracts/interfaces/draft-IERC7786.sol
diff --git a/contracts/token/ERC20/extensions/draft-IERC7802.sol b/contracts/interfaces/draft-IERC7802.sol
similarity index 100%
rename from contracts/token/ERC20/extensions/draft-IERC7802.sol
rename to contracts/interfaces/draft-IERC7802.sol
diff --git a/contracts/mocks/crosschain/ERC7786GatewayMock.sol b/contracts/mocks/crosschain/ERC7786GatewayMock.sol
index bd3a4aae..c4bc477e 100644
--- a/contracts/mocks/crosschain/ERC7786GatewayMock.sol
+++ b/contracts/mocks/crosschain/ERC7786GatewayMock.sol
@@ -6,7 +6,7 @@ import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {CAIP2} from "@openzeppelin/contracts/utils/CAIP2.sol";
 import {CAIP10} from "@openzeppelin/contracts/utils/CAIP10.sol";
-import {IERC7786GatewaySource, IERC7786Receiver} from "../../crosschain/interfaces/draft-IERC7786.sol";
+import {IERC7786GatewaySource, IERC7786Receiver} from "../../interfaces/draft-IERC7786.sol";
 
 contract ERC7786GatewayMock is IERC7786GatewaySource {
     using BitMaps for BitMaps.BitMap;
diff --git a/contracts/mocks/crosschain/ERC7786ReceiverInvalidMock.sol b/contracts/mocks/crosschain/ERC7786ReceiverInvalidMock.sol
index d5b3d0f4..035e3b4b 100644
--- a/contracts/mocks/crosschain/ERC7786ReceiverInvalidMock.sol
+++ b/contracts/mocks/crosschain/ERC7786ReceiverInvalidMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC7786Receiver} from "../../crosschain/interfaces/draft-IERC7786.sol";
+import {IERC7786Receiver} from "../../interfaces/draft-IERC7786.sol";
 
 contract ERC7786ReceiverInvalidMock is IERC7786Receiver {
     function executeMessage(
diff --git a/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol b/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol
index 0687b270..3bbd6970 100644
--- a/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol
+++ b/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol
@@ -3,8 +3,8 @@
 pragma solidity ^0.8.20;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {IERC7802} from "./draft-IERC7802.sol";
 import {ERC165, IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {IERC7802} from "../../../interfaces/draft-IERC7802.sol";
 
 /**
  * @dev ERC20 extension that implements the standard token interface according to