Fix imports in merkle-distributor

contracts/interfaces/IRewardsOracle.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: agpl-3.0
+pragma solidity 0.7.5;
+
+interface IRewardsOracle {
+
+  /**
+   * @notice Returns the oracle value, agreed upon by all oracle signers. If the signers have not
+   *  agreed upon a value, should return zero for all return values.
+   *
+   * @return  merkleRoot  The Merkle root for the next Merkle distributor update.
+   * @return  ipfsCid     An IPFS CID pointing to the Merkle tree data.
+   * @return  epoch       The epoch number corresponding to the new Merkle root.
+   */
+  function read() external virtual view returns (bytes32 merkleRoot, bytes32 ipfsCid, uint256 epoch);
+}

contracts/merkle-distributor/v1/impl/MD1Logic.sol

@@ -1,10 +1,10 @@
 pragma solidity 0.7.5;
 pragma experimental ABIEncoderV2;
 
-import { SafeERC20 } from '../../../dependencies/open-zeppelin/SafeERC20.sol';
 import { SafeMath } from '../../../dependencies/open-zeppelin/SafeMath.sol';
 import { MerkleProof } from '../../../dependencies/open-zeppelin/MerkleProof.sol';
 import { IERC20 } from '../../../interfaces/IERC20.sol';
+import { SafeERC20 } from '../../../lib/SafeERC20.sol';
 import {MD1Types} from '../lib/MD1Types.sol';
 import {MD1Pausable} from './MD1Pausable.sol';
 

contracts/merkle-distributor/v1/impl/MD1Storage.sol

@@ -6,7 +6,7 @@ import {
 } from '../../../dependencies/open-zeppelin/AccessControlUpgradeable.sol';
 import { IERC20 } from '../../../interfaces/IERC20.sol';
 import { IRewardsOracle } from '../../../interfaces/IRewardsOracle.sol';
-import {ReentrancyGuard} from '../../../utils/ReentrancyGuard.sol';
+import {ReentrancyGuard} from '../../../lib/ReentrancyGuard.sol';
 import {VersionedInitializable} from '../../../utils/VersionedInitializable.sol';
 import {MD1Types} from '../lib/MD1Types.sol';