diff --git a/contracts/src/yield/bridge/L2YieldMessageService.sol b/contracts/src/messaging/l2/L2YieldMessageService.sol
similarity index 94%
rename from contracts/src/yield/bridge/L2YieldMessageService.sol
rename to contracts/src/messaging/l2/L2YieldMessageService.sol
index f7088786..ec4b06f6 100644
--- a/contracts/src/yield/bridge/L2YieldMessageService.sol
+++ b/contracts/src/messaging/l2/L2YieldMessageService.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.8.30;
 
-import { L2MessageServiceBase } from "../../messaging/l2/L2MessageServiceBase.sol";
+import { L2MessageServiceBase } from "./L2MessageServiceBase.sol";
 
 contract L2YieldMessageService is L2MessageServiceBase {
   error L2YieldMessageService__InvalidValue();
diff --git a/contracts/test/foundry/yield/bridge/L2YieldMessageService.t.sol b/contracts/test/foundry/messaging/l2/L2YieldMessageService.t.sol
similarity index 93%
rename from contracts/test/foundry/yield/bridge/L2YieldMessageService.t.sol
rename to contracts/test/foundry/messaging/l2/L2YieldMessageService.t.sol
index 08e0cdc3..9186e35e 100644
--- a/contracts/test/foundry/yield/bridge/L2YieldMessageService.t.sol
+++ b/contracts/test/foundry/messaging/l2/L2YieldMessageService.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.30;
 
 import { Test } from "forge-std/Test.sol";
 import { L2MessageService } from "../../../../src/messaging/l2/L2MessageService.sol";
-import { L2YieldMessageService } from "../../../../src/yield/bridge/L2YieldMessageService.sol";
+import { L2YieldMessageService } from "../../../../src/messaging/l2/L2YieldMessageService.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import { IPermissionsManager } from "../../../../src/security/access/interfaces/IPermissionsManager.sol";
 import { IPauseManager } from "../../../../src/security/pausing/interfaces/IPauseManager.sol";