diff --git a/contracts/src/yield/bridge/YieldRollup.sol b/contracts/src/rollup/YieldRollup.sol
similarity index 89%
rename from contracts/src/yield/bridge/YieldRollup.sol
rename to contracts/src/rollup/YieldRollup.sol
index d1d2e130..f01ff6c8 100644
--- a/contracts/src/yield/bridge/YieldRollup.sol
+++ b/contracts/src/rollup/YieldRollup.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.8.30;
 
-import { IMessageService } from "../../messaging/interfaces/IMessageService.sol";
-import { L1MessageService } from "../../messaging/l1/L1MessageService.sol";
-import { LineaRollupBase } from "../../rollup/LineaRollupBase.sol";
+import { IMessageService } from "../messaging/interfaces/IMessageService.sol";
+import { L1MessageService } from "../messaging/l1/L1MessageService.sol";
+import { LineaRollupBase } from "./LineaRollupBase.sol";
 
 contract YieldRollup is LineaRollupBase {
   error YieldRollup__L1ETHBridgeNotSet();
diff --git a/contracts/test/foundry/yield/bridge/TestUtils.sol b/contracts/test/foundry/rollup/TestUtils.sol
similarity index 100%
rename from contracts/test/foundry/yield/bridge/TestUtils.sol
rename to contracts/test/foundry/rollup/TestUtils.sol
diff --git a/contracts/test/foundry/yield/bridge/YieldRollup.t.sol b/contracts/test/foundry/rollup/YieldRollup.t.sol
similarity index 89%
rename from contracts/test/foundry/yield/bridge/YieldRollup.t.sol
rename to contracts/test/foundry/rollup/YieldRollup.t.sol
index 8ef67c24..31f5120b 100644
--- a/contracts/test/foundry/yield/bridge/YieldRollup.t.sol
+++ b/contracts/test/foundry/rollup/YieldRollup.t.sol
@@ -3,12 +3,12 @@ pragma solidity ^0.8.30;
 
 import { Test } from "forge-std/Test.sol";
 import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import { ILineaRollup } from "../../../../src/rollup/interfaces/ILineaRollup.sol";
-import { IPermissionsManager } from "../../../../src/security/access/interfaces/IPermissionsManager.sol";
-import { IPauseManager } from "../../../../src/security/pausing/interfaces/IPauseManager.sol";
-import { IMessageService } from "../../../../src/messaging/interfaces/IMessageService.sol";
-import { LineaRollup } from "../../../../src/rollup/LineaRollup.sol";
-import { YieldRollup } from "../../../../src/yield/bridge/YieldRollup.sol";
+import { ILineaRollup } from "../../../src/rollup/interfaces/ILineaRollup.sol";
+import { IPermissionsManager } from "../../../src/security/access/interfaces/IPermissionsManager.sol";
+import { IPauseManager } from "../../../src/security/pausing/interfaces/IPauseManager.sol";
+import { IMessageService } from "../../../src/messaging/interfaces/IMessageService.sol";
+import { LineaRollup } from "../../../src/rollup/LineaRollup.sol";
+import { YieldRollup } from "../../../src/rollup/YieldRollup.sol";
 import { TestUtils } from "./TestUtils.sol";
 
 contract YieldRollupTest is Test {