Fix: update contracts folder structure

contracts/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-src = 'contracts'
+src = 'src'
 out = 'out'
 libs = ['node_modules', 'lib']
 cache_path  = 'cache_forge'

contracts/hardhat.config.ts

@@ -30,6 +30,7 @@ const useViaIR = process.env.ENABLE_VIA_IR === "true";
 const config: HardhatUserConfig = {
   paths: {
     artifacts: "./build",
+    sources: "./src",
   },
   solidity: {
     // NB: double check the autoupdate shell script version complies to the latest solidity version if you add a new one.

contracts/contracts/test-contracts/IntegrationTestTrueVerifier.sol → contracts/src/_testing/integration/IntegrationTestTrueVerifier.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { IPlonkVerifier } from "../interfaces/l1/IPlonkVerifier.sol";
+import { IPlonkVerifier } from "../../verifiers/interfaces/IPlonkVerifier.sol";
 
 contract IntegrationTestTrueVerifier is IPlonkVerifier {
   /// @dev Always returns true for quick turnaround testing.

contracts/contracts/test-contracts/RevertingVerifier.sol → contracts/src/_testing/mocks/base/RevertingVerifier.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { IPlonkVerifier } from "../interfaces/l1/IPlonkVerifier.sol";
+import { IPlonkVerifier } from "../../../verifiers/interfaces/IPlonkVerifier.sol";
 
 /// @dev Test verifier contract that returns true.
 contract RevertingVerifier is IPlonkVerifier {

contracts/contracts/test-contracts/TestClaimingCaller.sol → contracts/src/_testing/mocks/base/TestClaimingCaller.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { IMessageService } from "../interfaces/IMessageService.sol";
+import { IMessageService } from "../../../messaging/interfaces/IMessageService.sol";
 
 contract TestClaimingCaller {
   address private expectedAddress;

contracts/contracts/tokenBridge/mocks/MockMessageService.sol → contracts/src/_testing/mocks/bridging/MockMessageService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.19;
 
-import { IMessageService } from "../../interfaces/IMessageService.sol";
+import { IMessageService } from "../../../messaging/interfaces/IMessageService.sol";
 
 contract MockMessageService is IMessageService {
   uint256 public constant CALL_GAS_LIMIT = 1000000;

contracts/contracts/tokenBridge/mocks/MessageBridgeV2/MockMessageServiceV2.sol → contracts/src/_testing/mocks/bridging/MockMessageServiceV2.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.8.19 <=0.8.26;
 
-import { IMessageService } from "../../../interfaces/IMessageService.sol";
+import { IMessageService } from "../../../messaging/interfaces/IMessageService.sol";
 import { IGenericErrors } from "../../../interfaces/IGenericErrors.sol";
-import { LineaRollupPauseManager } from "../../../lib/LineaRollupPauseManager.sol";
-import { L1MessageManager } from "../../../messageService/l1/L1MessageManager.sol";
+import { LineaRollupPauseManager } from "../../../security/pausing/LineaRollupPauseManager.sol";
+import { L1MessageManager } from "../../../messaging/l1/L1MessageManager.sol";
 
 contract MockMessageServiceV2 is L1MessageManager, IMessageService, LineaRollupPauseManager, IGenericErrors {
   address internal messageSender = address(0);

contracts/contracts/tokenBridge/mocks/MockTokenBridge.sol → contracts/src/_testing/mocks/bridging/MockTokenBridge.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.19;
 
-import { TokenBridge } from "../TokenBridge.sol";
+import { TokenBridge } from "../../../bridging/token/TokenBridge.sol";
 
 contract MockTokenBridge is TokenBridge {
   function setNativeMappingValue(address token, address value) external {

contracts/contracts/tokenBridge/mocks/TestTokenBridge.sol → contracts/src/_testing/mocks/bridging/TestTokenBridge.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.19;
 
-import { TokenBridge } from "../TokenBridge.sol";
+import { TokenBridge } from "../../../bridging/token/TokenBridge.sol";
 
 contract TestTokenBridge is TokenBridge {
   function testReturnDataToString(bytes memory _data) public pure returns (string memory) {

contracts/contracts/tokenBridge/mocks/UpgradedBridgedToken.sol → contracts/src/_testing/mocks/bridging/UpgradedBridgedToken.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.19;
 
-import { BridgedToken } from "../BridgedToken.sol";
+import { BridgedToken } from "../../../bridging/token/BridgedToken.sol";
 
 contract UpgradedBridgedToken is BridgedToken {
   function isUpgraded() external pure returns (bool) {

contracts/contracts/tokenBridge/mocks/Reentrancy/ReentrancyContract.sol → contracts/src/_testing/mocks/security/reentrancy/ReentrancyContract.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import { TokenBridge } from "../../TokenBridge.sol";
+import { TokenBridge } from "../../../../bridging/token/TokenBridge.sol";
 
 contract ReentrancyContract {
   // The Linea `TokenBridge` contract

contracts/contracts/test-contracts/TestL1MessageManager.sol → contracts/src/_testing/unit/TestL1MessageManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { L1MessageManager } from "../messageService/l1/L1MessageManager.sol";
+import { L1MessageManager } from "../../messaging/l1/L1MessageManager.sol";
 
 contract TestL1MessageManager is L1MessageManager {
   /**

contracts/contracts/test-contracts/TestL1MessageService.sol → contracts/src/_testing/unit/TestL1MessageService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { L1MessageService } from "../messageService/l1/L1MessageService.sol";
+import { L1MessageService } from "../../messaging/l1/L1MessageService.sol";
 import { TestSetPauseTypeRoles } from "./TestSetPauseTypeRoles.sol";
 
 contract TestL1MessageService is L1MessageService, TestSetPauseTypeRoles {

contracts/contracts/test-contracts/TestL1MessageServiceMerkleProof.sol → contracts/src/_testing/unit/TestL1MessageServiceMerkleProof.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { L1MessageService } from "../messageService/l1/L1MessageService.sol";
-import { IL1MessageService } from "../interfaces/l1/IL1MessageService.sol";
+import { L1MessageService } from "../../messaging/l1/L1MessageService.sol";
+import { IL1MessageService } from "../../messaging/l1/interfaces/IL1MessageService.sol";
 import { TestSetPauseTypeRoles } from "./TestSetPauseTypeRoles.sol";
 
 interface ITestL1MessageService {

contracts/contracts/test-contracts/TestL2MessageManager.sol → contracts/src/_testing/unit/TestL2MessageManager.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.19;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { L2MessageManager } from "../messageService/l2/L2MessageManager.sol";
-import { IGenericErrors } from "../interfaces/IGenericErrors.sol";
+import { L2MessageManager } from "../../messaging/l2/L2MessageManager.sol";
+import { IGenericErrors } from "../../interfaces/IGenericErrors.sol";
 import { TestSetPauseTypeRoles } from "./TestSetPauseTypeRoles.sol";
 
 contract TestL2MessageManager is Initializable, L2MessageManager, IGenericErrors, TestSetPauseTypeRoles {

contracts/contracts/test-contracts/TestL2MessageService.sol → contracts/src/_testing/unit/TestL2MessageService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.19;
 
-import { L2MessageService } from "../messageService/l2/L2MessageService.sol";
+import { L2MessageService } from "../../messaging/l2/L2MessageService.sol";
 
 contract TestL2MessageService is L2MessageService {
   address public originalSender;

contracts/contracts/test-contracts/TestLineaRollup.sol → contracts/src/_testing/unit/TestLineaRollup.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { LineaRollup } from "../LineaRollup.sol";
+import { LineaRollup } from "../../rollup/LineaRollup.sol";
 
 contract TestLineaRollup is LineaRollup {
   function addRollingHash(uint256 _messageNumber, bytes32 _messageHash) external {

contracts/contracts/test-contracts/TestLineaRollupV5.sol → contracts/src/_testing/unit/TestLineaRollupV5.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.24;
 
-import { LineaRollupV5 } from "./LineaRollupV5.sol";
+import { LineaRollupV5 } from "../integration/LineaRollupV5.sol";
 
 contract TestLineaRollupV5 is LineaRollupV5 {
   function setDefaultShnarfExistValue(bytes32 _shnarf) external {

contracts/contracts/test-contracts/TestMessageServiceBase.sol → contracts/src/_testing/unit/TestMessageServiceBase.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.8.19 <=0.8.26;
 
-import { MessageServiceBase } from "../messageService/MessageServiceBase.sol";
+import { MessageServiceBase } from "../../messaging/MessageServiceBase.sol";
 
 contract TestMessageServiceBase is MessageServiceBase {
   function initialize(address _messageService, address _remoteSender) external initializer {

contracts/contracts/test-contracts/TestPauseManager.sol → contracts/src/_testing/unit/TestPauseManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.8.19 <=0.8.26;
 
-import { PauseManager } from "../lib/PauseManager.sol";
+import { PauseManager } from "../../security/pausing/PauseManager.sol";
 import { TestSetPauseTypeRoles } from "./TestSetPauseTypeRoles.sol";
 
 contract TestPauseManager is PauseManager, TestSetPauseTypeRoles {

contracts/contracts/test-contracts/TestPublicInputVerifier.sol → contracts/src/_testing/unit/TestPublicInputVerifier.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { IPlonkVerifier } from "../interfaces/l1/IPlonkVerifier.sol";
+import { IPlonkVerifier } from "../../verifiers/interfaces/IPlonkVerifier.sol";
 
 /// @dev Test verifier contract that returns true.
 contract TestPublicInputVerifier is IPlonkVerifier {

contracts/contracts/test-contracts/TestRateLimiter.sol → contracts/src/_testing/unit/TestRateLimiter.sol

@@ -2,7 +2,7 @@
 pragma solidity >=0.8.19 <=0.8.26;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { RateLimiter } from "../messageService/lib/RateLimiter.sol";
+import { RateLimiter } from "../../security/limiting/RateLimiter.sol";
 
 contract TestRateLimiter is Initializable, RateLimiter {
   // we need eth to test the limits with

contracts/contracts/test-contracts/TestSetPauseTypeRoles.sol → contracts/src/_testing/unit/TestSetPauseTypeRoles.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity >=0.8.19 <=0.8.26;
 
-import { PauseManager } from "../lib/PauseManager.sol";
+import { PauseManager } from "../../security/pausing/PauseManager.sol";
 
 contract TestSetPauseTypeRoles is PauseManager {
   function initializePauseTypesAndPermissions(

contracts/contracts/test-contracts/TestSparseMerkleTreeVerifier.sol → contracts/src/_testing/unit/TestSparseMerkleTreeVerifier.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { SparseMerkleTreeVerifier } from "../messageService/lib/SparseMerkleTreeVerifier.sol";
-import { Utils } from "../lib/Utils.sol";
+import { SparseMerkleTreeVerifier } from "../../messaging/libraries/SparseMerkleTreeVerifier.sol";
+import { Utils } from "../../libraries/Utils.sol";
 
 contract TestSparseMerkleTreeVerifier {
   using SparseMerkleTreeVerifier for *;

contracts/contracts/test-contracts/TestUtils.sol → contracts/src/_testing/unit/TestUtils.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { Utils } from "../lib/Utils.sol";
+import { Utils } from "../../libraries/Utils.sol";
 
 contract TestUtils {
   function efficientKeccak(bytes32 _left, bytes32 _right) external pure returns (bytes32 value) {

contracts/contracts/tokenBridge/TokenBridge.sol → contracts/src/bridging/token/TokenBridge.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import { ITokenBridge } from "./interfaces/ITokenBridge.sol";
-import { IMessageService } from "../interfaces/IMessageService.sol";
+import { IMessageService } from "../../messaging/interfaces/IMessageService.sol";
 
 import { IERC20PermitUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20PermitUpgradeable.sol";
 import { IERC20MetadataUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
@@ -14,14 +14,14 @@ import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 import { BridgedToken } from "./BridgedToken.sol";
-import { MessageServiceBase } from "../messageService/MessageServiceBase.sol";
+import { MessageServiceBase } from "../../messaging/MessageServiceBase.sol";
 
-import { TokenBridgePauseManager } from "../lib/TokenBridgePauseManager.sol";
+import { TokenBridgePauseManager } from "../../security/pausing/TokenBridgePauseManager.sol";
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
-import { StorageFiller39 } from "./lib/StorageFiller39.sol";
-import { PermissionsManager } from "../lib/PermissionsManager.sol";
+import { StorageFiller39 } from "./utils/StorageFiller39.sol";
+import { PermissionsManager } from "../../security/access/PermissionsManager.sol";
 
-import { Utils } from "../lib/Utils.sol";
+import { Utils } from "../../libraries/Utils.sol";
 /**
  * @title Linea Canonical Token Bridge
  * @notice Contract to manage cross-chain ERC20 bridging.

contracts/contracts/tokenBridge/interfaces/ITokenBridge.sol → contracts/src/bridging/token/interfaces/ITokenBridge.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.19;
 
-import { IPauseManager } from "../../interfaces/IPauseManager.sol";
-import { IPermissionsManager } from "../../interfaces/IPermissionsManager.sol";
+import { IPauseManager } from "../../../security/pausing/interfaces/IPauseManager.sol";
+import { IPermissionsManager } from "../../../security/access/interfaces/IPermissionsManager.sol";
 
 /**
  * @title Interface declaring Canonical Token Bridge struct, functions, events and errors.

contracts/contracts/messageService/MessageServiceBase.sol → contracts/src/messaging/MessageServiceBase.sol

@@ -2,7 +2,7 @@
 pragma solidity >=0.8.19 <=0.8.26;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { IMessageService } from "../interfaces/IMessageService.sol";
+import { IMessageService } from "./interfaces/IMessageService.sol";
 import { IGenericErrors } from "../interfaces/IGenericErrors.sol";
 
 /**

contracts/contracts/messageService/l1/L1MessageManager.sol → contracts/src/messaging/l1/L1MessageManager.sol

@@ -3,8 +3,8 @@ pragma solidity 0.8.26;
 
 import { BitMaps } from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
 import { L1MessageManagerV1 } from "./v1/L1MessageManagerV1.sol";
-import { IL1MessageManager } from "../../interfaces/l1/IL1MessageManager.sol";
-import { Utils } from "../../lib/Utils.sol";
+import { IL1MessageManager } from "./interfaces/IL1MessageManager.sol";
+import { Utils } from "../../libraries/Utils.sol";
 
 /**
  * @title Contract to manage cross-chain message rolling hash computation and storage on L1.

contracts/contracts/messageService/l1/L1MessageService.sol → contracts/src/messaging/l1/L1MessageService.sol

@@ -4,11 +4,11 @@ pragma solidity 0.8.26;
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { L1MessageServiceV1 } from "./v1/L1MessageServiceV1.sol";
 import { L1MessageManager } from "./L1MessageManager.sol";
-import { IL1MessageService } from "../../interfaces/l1/IL1MessageService.sol";
+import { IL1MessageService } from "./interfaces/IL1MessageService.sol";
 import { IGenericErrors } from "../../interfaces/IGenericErrors.sol";
-import { SparseMerkleTreeVerifier } from "../lib/SparseMerkleTreeVerifier.sol";
-import { TransientStorageHelpers } from "../lib/TransientStorageHelpers.sol";
-import { MessageHashing } from "../lib/MessageHashing.sol";
+import { SparseMerkleTreeVerifier } from "../libraries/SparseMerkleTreeVerifier.sol";
+import { TransientStorageHelpers } from "../../libraries/TransientStorageHelpers.sol";
+import { MessageHashing } from "../libraries/MessageHashing.sol";
 
 /**
  * @title Contract to manage cross-chain messaging on L1.

contracts/contracts/messageService/l1/v1/L1MessageManagerV1.sol → contracts/src/messaging/l1/v1/L1MessageManagerV1.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.26;
 
-import { IL1MessageManagerV1 } from "../../../interfaces/l1/IL1MessageManagerV1.sol";
+import { IL1MessageManagerV1 } from "./interfaces/IL1MessageManagerV1.sol";
 
 /**
  * @title Contract to manage cross-chain message hashes storage and status on L1.

contracts/contracts/messageService/l1/v1/L1MessageServiceV1.sol → contracts/src/messaging/l1/v1/L1MessageServiceV1.sol

@@ -2,13 +2,13 @@
 pragma solidity 0.8.26;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { LineaRollupPauseManager } from "../../../lib/LineaRollupPauseManager.sol";
-import { RateLimiter } from "../../lib/RateLimiter.sol";
+import { LineaRollupPauseManager } from "../../../security/pausing/LineaRollupPauseManager.sol";
+import { RateLimiter } from "../../../security/limiting/RateLimiter.sol";
 import { L1MessageManagerV1 } from "./L1MessageManagerV1.sol";
-import { TransientStorageReentrancyGuardUpgradeable } from "../TransientStorageReentrancyGuardUpgradeable.sol";
-import { IMessageService } from "../../../interfaces/IMessageService.sol";
-import { TransientStorageHelpers } from "../../lib/TransientStorageHelpers.sol";
-import { MessageHashing } from "../../lib/MessageHashing.sol";
+import { TransientStorageReentrancyGuardUpgradeable } from "../../../security/reentrancy/TransientStorageReentrancyGuardUpgradeable.sol";
+import { IMessageService } from "../../interfaces/IMessageService.sol";
+import { TransientStorageHelpers } from "../../../libraries/TransientStorageHelpers.sol";
+import { MessageHashing } from "../../libraries/MessageHashing.sol";
 
 /**
  * @title Contract to manage cross-chain messaging on L1.

contracts/contracts/messageService/l2/L2MessageManager.sol → contracts/src/messaging/l2/L2MessageManager.sol

@@ -3,8 +3,8 @@ pragma solidity 0.8.19;
 
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { L2MessageManagerV1 } from "./v1/L2MessageManagerV1.sol";
-import { IL2MessageManager } from "../../interfaces/l2/IL2MessageManager.sol";
-import { Utils } from "../../lib/Utils.sol";
+import { IL2MessageManager } from "./interfaces/IL2MessageManager.sol";
+import { Utils } from "../../libraries/Utils.sol";
 
 /**
  * @title Contract to manage cross-chain message hashes storage and statuses on L2.

contracts/contracts/messageService/l2/L2MessageService.sol → contracts/src/messaging/l2/L2MessageService.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { L2MessageServiceV1 } from "./v1/L2MessageServiceV1.sol";
 import { L2MessageManager } from "./L2MessageManager.sol";
-import { PermissionsManager } from "../../lib/PermissionsManager.sol";
+import { PermissionsManager } from "../../security/access/PermissionsManager.sol";
 
 /**
  * @title Contract to manage cross-chain messaging on L2.

contracts/contracts/messageService/l2/v1/L2MessageManagerV1.sol → contracts/src/messaging/l2/v1/L2MessageManagerV1.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.19;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { IL2MessageManagerV1 } from "../../../interfaces/l2/IL2MessageManagerV1.sol";
-import { L2MessageServicePauseManager } from "../../../lib/L2MessageServicePauseManager.sol";
+import { IL2MessageManagerV1 } from "./interfaces/IL2MessageManagerV1.sol";
+import { L2MessageServicePauseManager } from "../../../security/pausing/L2MessageServicePauseManager.sol";
 
 /**
  * @title Contract to manage cross-chain message hashes storage and statuses on L2.

contracts/contracts/messageService/l2/v1/L2MessageServiceV1.sol → contracts/src/messaging/l2/v1/L2MessageServiceV1.sol

@@ -3,12 +3,12 @@ pragma solidity 0.8.19;
 
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
-import { IMessageService } from "../../../interfaces/IMessageService.sol";
-import { IL2MessageServiceV1 } from "../../../interfaces/l2/IL2MessageServiceV1.sol";
+import { IMessageService } from "../../interfaces/IMessageService.sol";
+import { IL2MessageServiceV1 } from "./interfaces/IL2MessageServiceV1.sol";
 import { IGenericErrors } from "../../../interfaces/IGenericErrors.sol";
-import { RateLimiter } from "../../lib/RateLimiter.sol";
+import { RateLimiter } from "../../../security/limiting/RateLimiter.sol";
 import { L2MessageManagerV1 } from "./L2MessageManagerV1.sol";
-import { MessageHashing } from "../../lib/MessageHashing.sol";
+import { MessageHashing } from "../../libraries/MessageHashing.sol";
 
 /**
  * @title Contract to manage cross-chain messaging on L2.