Move Sol files from top level to project dirs (#11227)

* mv agg interfaces

* rm unused ownable interface

* mv AuthorizedReceiverInterface

* mv libs to llo-feeds

* fix interfaces/AggregatorV2V3Interface ref

* rm dup interface

contracts/gas-snapshots/llo-feeds.gas-snapshot

@@ -1,3 +1,23 @@
+ByteUtilTest:test_readAddress() (gas: 542)
+ByteUtilTest:test_readAddressMultiWord() (gas: 540)
+ByteUtilTest:test_readAddressWithEmptyArray() (gas: 3274)
+ByteUtilTest:test_readAddressWithNotEnoughBytes() (gas: 3314)
+ByteUtilTest:test_readUint192Max() (gas: 485)
+ByteUtilTest:test_readUint192Min() (gas: 508)
+ByteUtilTest:test_readUint192MultiWord() (gas: 486)
+ByteUtilTest:test_readUint192WithEmptyArray() (gas: 3274)
+ByteUtilTest:test_readUint192WithNotEnoughBytes() (gas: 3314)
+ByteUtilTest:test_readUint256Max() (gas: 502)
+ByteUtilTest:test_readUint256Min() (gas: 546)
+ByteUtilTest:test_readUint256MultiWord() (gas: 500)
+ByteUtilTest:test_readUint256WithEmptyArray() (gas: 3296)
+ByteUtilTest:test_readUint256WithNotEnoughBytes() (gas: 3293)
+ByteUtilTest:test_readUint32Max() (gas: 507)
+ByteUtilTest:test_readUint32Min() (gas: 487)
+ByteUtilTest:test_readUint32MultiWord() (gas: 552)
+ByteUtilTest:test_readUint32WithEmptyArray() (gas: 3253)
+ByteUtilTest:test_readUint32WithNotEnoughBytes() (gas: 3272)
+ByteUtilTest:test_readZeroAddress() (gas: 519)
 FeeManagerProcessFeeTest:test_DiscountIsAppliedForNative() (gas: 52282)
 FeeManagerProcessFeeTest:test_DiscountIsReturnedForNative() (gas: 52235)
 FeeManagerProcessFeeTest:test_DiscountIsReturnedForNativeWithSurcharge() (gas: 78440)

contracts/scripts/native_solc_compile_all_feeds

@@ -30,6 +30,6 @@ compileContract () {
 }
 
 # Aggregators
-compileContract interfaces/AggregatorV2V3Interface.sol
+compileContract shared/interfaces/AggregatorV2V3Interface.sol
 compileContract Chainlink.sol
 compileContract ChainlinkClient.sol

contracts/src/v0.8/ValidatorProxy.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {ConfirmedOwner} from "./shared/access/ConfirmedOwner.sol";
-import {AggregatorValidatorInterface} from "./interfaces/AggregatorValidatorInterface.sol";
+import {AggregatorValidatorInterface} from "./shared/interfaces/AggregatorValidatorInterface.sol";
 import {TypeAndVersionInterface} from "./interfaces/TypeAndVersionInterface.sol";
 
 // solhint-disable custom-errors

contracts/src/v0.8/automation/v1_2/KeeperRegistry1_2.sol

@@ -7,7 +7,7 @@ import "@openzeppelin/contracts/security/Pausable.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "../KeeperBase.sol";
 import "../../interfaces/TypeAndVersionInterface.sol";
-import "../../interfaces/AggregatorV3Interface.sol";
+import "../../shared/interfaces/AggregatorV3Interface.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
 import "../interfaces/v1_2/KeeperRegistryInterface1_2.sol";
 import "../interfaces/MigratableKeeperRegistryInterface.sol";

contracts/src/v0.8/automation/v1_3/KeeperRegistryBase1_3.sol

@@ -8,7 +8,7 @@ import "../../vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_
 import "../ExecutionPrevention.sol";
 import {Config, Upkeep} from "../interfaces/v1_3/AutomationRegistryInterface1_3.sol";
 import "../../shared/access/ConfirmedOwner.sol";
-import "../../interfaces/AggregatorV3Interface.sol";
+import "../../shared/interfaces/AggregatorV3Interface.sol";
 import "../../shared/interfaces/LinkTokenInterface.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
 import "../interfaces/UpkeepTranscoderInterface.sol";

contracts/src/v0.8/automation/v2_0/KeeperRegistryBase2_0.sol

@@ -7,7 +7,7 @@ import "../../vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_
 import {ArbSys} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 import "../ExecutionPrevention.sol";
 import "../../shared/access/ConfirmedOwner.sol";
-import "../../interfaces/AggregatorV3Interface.sol";
+import "../../shared/interfaces/AggregatorV3Interface.sol";
 import "../../shared/interfaces/LinkTokenInterface.sol";
 import "../interfaces/KeeperCompatibleInterface.sol";
 import "../interfaces/UpkeepTranscoderInterface.sol";

contracts/src/v0.8/automation/v2_1/KeeperRegistryBase2_1.sol

@@ -11,7 +11,7 @@ import {StreamsLookupCompatibleInterface} from "../interfaces/StreamsLookupCompa
 import {ILogAutomation, Log} from "../interfaces/ILogAutomation.sol";
 import {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
 import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
-import {AggregatorV3Interface} from "../../interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "../../shared/interfaces/AggregatorV3Interface.sol";
 import {LinkTokenInterface} from "../../shared/interfaces/LinkTokenInterface.sol";
 import {KeeperCompatibleInterface} from "../interfaces/KeeperCompatibleInterface.sol";
 import {UpkeepFormat} from "../interfaces/UpkeepTranscoderInterface.sol";

contracts/src/v0.8/functions/dev/v1_X/FunctionsBilling.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {IFunctionsSubscriptions} from "./interfaces/IFunctionsSubscriptions.sol";
-import {AggregatorV3Interface} from "../../../interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
 import {IFunctionsBilling} from "./interfaces/IFunctionsBilling.sol";
 
 import {Routable} from "./Routable.sol";

contracts/src/v0.8/functions/v1_0_0/FunctionsBilling.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {IFunctionsSubscriptions} from "./interfaces/IFunctionsSubscriptions.sol";
-import {AggregatorV3Interface} from "../../interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "../../shared/interfaces/AggregatorV3Interface.sol";
 import {IFunctionsBilling} from "./interfaces/IFunctionsBilling.sol";
 
 import {Routable} from "./Routable.sol";

contracts/src/v0.8/interfaces/FeedRegistryInterface.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 pragma abicoder v2;
 
-import {AggregatorV2V3Interface} from "./AggregatorV2V3Interface.sol";
+import {AggregatorV2V3Interface} from "../shared/interfaces/AggregatorV2V3Interface.sol";
 
 interface FeedRegistryInterface {
   struct Phase {

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.4;
 
 import {AddressAliasHelper} from "../../../vendor/arb-bridge-eth/v0.8.0-custom/contracts/libraries/AddressAliasHelper.sol";
-import {AggregatorInterface} from "../../../interfaces/AggregatorInterface.sol";
-import {AggregatorV3Interface} from "../../../interfaces/AggregatorV3Interface.sol";
-import {AggregatorV2V3Interface} from "../../../interfaces/AggregatorV2V3Interface.sol";
+import {AggregatorInterface} from "../../../shared/interfaces/AggregatorInterface.sol";
+import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV2V3Interface} from "../../../shared/interfaces/AggregatorV2V3Interface.sol";
 import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
 import {FlagsInterface} from "../interfaces/FlagsInterface.sol";
 import {ArbitrumSequencerUptimeFeedInterface} from "../interfaces/ArbitrumSequencerUptimeFeedInterface.sol";

contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AggregatorValidatorInterface} from "../../../interfaces/AggregatorValidatorInterface.sol";
+import {AggregatorValidatorInterface} from "../../../shared/interfaces/AggregatorValidatorInterface.sol";
 import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
 import {AccessControllerInterface} from "../../../shared/interfaces/AccessControllerInterface.sol";
 import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";

contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import {AggregatorInterface} from "../../../interfaces/AggregatorInterface.sol";
-import {AggregatorV3Interface} from "../../../interfaces/AggregatorV3Interface.sol";
-import {AggregatorV2V3Interface} from "../../../interfaces/AggregatorV2V3Interface.sol";
+import {AggregatorInterface} from "../../../shared/interfaces/AggregatorInterface.sol";
+import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV2V3Interface} from "../../../shared/interfaces/AggregatorV2V3Interface.sol";
 import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
 import {OptimismSequencerUptimeFeedInterface} from "./../interfaces/OptimismSequencerUptimeFeedInterface.sol";
 import {SimpleReadAccessController} from "../../../shared/access/SimpleReadAccessController.sol";

contracts/src/v0.8/l2ep/dev/optimism/OptimismValidator.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AggregatorValidatorInterface} from "../../../interfaces/AggregatorValidatorInterface.sol";
+import {AggregatorValidatorInterface} from "../../../shared/interfaces/AggregatorValidatorInterface.sol";
 import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
 import {OptimismSequencerUptimeFeedInterface} from "./../interfaces/OptimismSequencerUptimeFeedInterface.sol";
 

contracts/src/v0.8/llo-feeds/FeeManager.sol

@@ -5,7 +5,7 @@ import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
 import {IFeeManager} from "./interfaces/IFeeManager.sol";
 import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
 import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {Common} from "./libraries/Common.sol";
 import {IRewardManager} from "./interfaces/IRewardManager.sol";
 import {IWERC20} from "../shared/interfaces/IWERC20.sol";
 import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";

contracts/src/v0.8/llo-feeds/RewardManager.sol

@@ -5,7 +5,7 @@ import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
 import {IRewardManager} from "./interfaces/IRewardManager.sol";
 import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";
 import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
-import {Common} from "../libraries/Common.sol";
+import {Common} from "./libraries/Common.sol";
 import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**

contracts/src/v0.8/llo-feeds/Verifier.sol

@@ -6,7 +6,7 @@ import {IVerifier} from "./interfaces/IVerifier.sol";
 import {IVerifierProxy} from "./interfaces/IVerifierProxy.sol";
 import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
 import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {Common} from "./libraries/Common.sol";
 
 // OCR2 standard
 uint256 constant MAX_NUM_ORACLES = 31;

contracts/src/v0.8/llo-feeds/VerifierProxy.sol

@@ -8,7 +8,7 @@ import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol
 import {AccessControllerInterface} from "../shared/interfaces/AccessControllerInterface.sol";
 import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
 import {IVerifierFeeManager} from "./interfaces/IVerifierFeeManager.sol";
-import {Common} from "../libraries/Common.sol";
+import {Common} from "./libraries/Common.sol";
 
 /**
  * The verifier proxy contract is the gateway for all report verification requests

contracts/src/v0.8/llo-feeds/interfaces/IFeeManager.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 import {IVerifierFeeManager} from "./IVerifierFeeManager.sol";
 
 interface IFeeManager is IERC165, IVerifierFeeManager {

contracts/src/v0.8/llo-feeds/interfaces/IRewardManager.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 
 interface IRewardManager is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifier.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 
 interface IVerifier is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifierFeeManager.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 
 interface IVerifierFeeManager is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifierProxy.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.16;
 
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 import {AccessControllerInterface} from "../../shared/interfaces/AccessControllerInterface.sol";
 import {IVerifierFeeManager} from "./IVerifierFeeManager.sol";
 

contracts/src/v0.8/libraries/test/ByteUtilTest.t.sol → contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {Test} from "forge-std/Test.sol";
-import {ByteUtil} from "../ByteUtil.sol";
+import {ByteUtil} from "../libraries/ByteUtil.sol";
 
 contract ByteUtilTest is Test {
   using ByteUtil for bytes;

contracts/src/v0.8/llo-feeds/test/fee-manager/BaseFeeManager.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.16;
 import {Test} from "forge-std/Test.sol";
 import {FeeManager} from "../../FeeManager.sol";
 import {RewardManager} from "../../RewardManager.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import {ERC20Mock} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/mocks/ERC20Mock.sol";
 import {WERC20Mock} from "../../../shared/mocks/WERC20Mock.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";

contracts/src/v0.8/llo-feeds/test/fee-manager/FeeManager.getFeeAndReward.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.16;
 
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import "./BaseFeeManager.t.sol";
 
 /**

contracts/src/v0.8/llo-feeds/test/fee-manager/FeeManager.processFee.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.16;
 
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import "./BaseFeeManager.t.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 

contracts/src/v0.8/llo-feeds/test/gas/Gas_VerifierTest.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.16;
 
 import {BaseTest, BaseTestWithConfiguredVerifierAndFeeManager} from "../verifier/BaseVerifierTest.t.sol";
 import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 
 contract Verifier_setConfig is BaseTest {

contracts/src/v0.8/llo-feeds/test/mocks/ErroredVerifier.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {IVerifier} from "../../interfaces/IVerifier.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 contract ErroredVerifier is IVerifier {
   function supportsInterface(bytes4 interfaceId) public pure override returns (bool) {

contracts/src/v0.8/llo-feeds/test/reward-manager/BaseRewardManager.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.16;
 import {Test} from "forge-std/Test.sol";
 import {ERC20Mock} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/mocks/ERC20Mock.sol";
 import {RewardManager} from "../../RewardManager.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 
 /**

contracts/src/v0.8/llo-feeds/test/reward-manager/RewardManager.claim.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {BaseRewardManagerTest} from "./BaseRewardManager.t.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 /**
  * @title BaseRewardManagerTest

contracts/src/v0.8/llo-feeds/test/reward-manager/RewardManager.setRecipients.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {BaseRewardManagerTest} from "./BaseRewardManager.t.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 /**
  * @title BaseRewardManagerTest

contracts/src/v0.8/llo-feeds/test/reward-manager/RewardManager.updateRewardRecipients.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {BaseRewardManagerTest} from "./BaseRewardManager.t.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 /**
  * @title BaseRewardManagerTest

contracts/src/v0.8/llo-feeds/test/verifier/BaseVerifierTest.t.sol

@@ -10,7 +10,7 @@ import {Verifier} from "../../Verifier.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {AccessControllerInterface} from "../../../shared/interfaces/AccessControllerInterface.sol";
 import {FeeManager} from "../../FeeManager.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 import {ERC20Mock} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/mocks/ERC20Mock.sol";
 import {WERC20Mock} from "../../../shared/mocks/WERC20Mock.sol";
 import {FeeManager} from "../../FeeManager.sol";

contracts/src/v0.8/llo-feeds/test/verifier/VerifierProxySetVerifierTest.t.sol

@@ -5,7 +5,7 @@ import {BaseTestWithConfiguredVerifierAndFeeManager} from "./BaseVerifierTest.t.
 import {IVerifier} from "../../interfaces/IVerifier.sol";
 import {VerifierProxy} from "../../VerifierProxy.sol";
 import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 contract VerifierProxyInitializeVerifierTest is BaseTestWithConfiguredVerifierAndFeeManager {
   function test_revertsIfNotCorrectVerifier() public {

contracts/src/v0.8/llo-feeds/test/verifier/VerifierSetConfigFromSourceTest.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {BaseTest, BaseTestWithMultipleConfiguredDigests} from "./BaseVerifierTest.t.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 contract VerifierSetConfigFromSourceTest is BaseTest {
   function setUp() public virtual override {

contracts/src/v0.8/llo-feeds/test/verifier/VerifierSetConfigTest.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.16;
 
 import {BaseTest, BaseTestWithMultipleConfiguredDigests} from "./BaseVerifierTest.t.sol";
 import {Verifier} from "../../Verifier.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 contract VerifierSetConfigTest is BaseTest {
   function setUp() public virtual override {

contracts/src/v0.8/llo-feeds/test/verifier/VerifierVerifyTest.t.sol

@@ -5,7 +5,7 @@ import {BaseTestWithConfiguredVerifierAndFeeManager} from "./BaseVerifierTest.t.
 import {Verifier} from "../../Verifier.sol";
 import {VerifierProxy} from "../../VerifierProxy.sol";
 import {AccessControllerInterface} from "../../../shared/interfaces/AccessControllerInterface.sol";
-import {Common} from "../../../libraries/Common.sol";
+import {Common} from "../../libraries/Common.sol";
 
 contract VerifierVerifyTest is BaseTestWithConfiguredVerifierAndFeeManager {
   bytes32[3] internal s_reportContext;

contracts/src/v0.8/mocks/MockAggregatorValidator.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "../interfaces/AggregatorValidatorInterface.sol";
+import "../shared/interfaces/AggregatorValidatorInterface.sol";
 
 contract MockAggregatorValidator is AggregatorValidatorInterface {
   uint8 immutable id;

contracts/src/v0.8/operatorforwarder/dev/AuthorizedReceiver.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {AuthorizedReceiverInterface} from "../../interfaces/AuthorizedReceiverInterface.sol";
+import {AuthorizedReceiverInterface} from "./interfaces/AuthorizedReceiverInterface.sol";
 
 // solhint-disable custom-errors
 abstract contract AuthorizedReceiver is AuthorizedReceiverInterface {