diff --git a/contracts/chainlink_compatible/MockVRFConsumer.sol b/contracts/chainlink_compatible/mocks/MockVRFConsumer.sol
similarity index 100%
rename from contracts/chainlink_compatible/MockVRFConsumer.sol
rename to contracts/chainlink_compatible/mocks/MockVRFConsumer.sol
diff --git a/contracts/MockVRFConsumer.sol b/contracts/mocks/MockVRFConsumer.sol
similarity index 82%
rename from contracts/MockVRFConsumer.sol
rename to contracts/mocks/MockVRFConsumer.sol
index 7422a80..b525b9e 100644
--- a/contracts/MockVRFConsumer.sol
+++ b/contracts/mocks/MockVRFConsumer.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {GelatoVRFConsumer} from "./GelatoVRFConsumer.sol";
+import {IGelatoVRFConsumer} from "../IGelatoVRFConsumer.sol";
 
-contract MockVRFConsumer is GelatoVRFConsumer {
+contract MockVRFConsumer is IGelatoVRFConsumer {
     uint256 public latestRandomness;
     address public dedicatedMsgSender;
 
diff --git a/contracts/MockVRFConsumerBase.sol b/contracts/mocks/MockVRFConsumerBase.sol
similarity index 91%
rename from contracts/MockVRFConsumerBase.sol
rename to contracts/mocks/MockVRFConsumerBase.sol
index 10eb430..07bc385 100644
--- a/contracts/MockVRFConsumerBase.sol
+++ b/contracts/mocks/MockVRFConsumerBase.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {GelatoVRFConsumerBase} from "./GelatoVRFConsumerBase.sol";
+import {GelatoVRFConsumerBase} from "../GelatoVRFConsumerBase.sol";
 
 contract MockVRFConsumerBase is GelatoVRFConsumerBase {
     uint256 public latestRandomness;