diff --git a/solidity/scripts/Deploy.sol b/solidity/scripts/Deploy.sol
index 61a80552..f984e842 100644
--- a/solidity/scripts/Deploy.sol
+++ b/solidity/scripts/Deploy.sol
@@ -13,10 +13,10 @@ import {BondEscalationModule} from '../contracts/modules/dispute/BondEscalationM
 import {CircuitResolverModule} from '../contracts/examples/modules/dispute/CircuitResolverModule.sol';
 import {RootVerificationModule} from '../contracts/examples/modules/dispute/RootVerificationModule.sol';
 
+import {CallbackModule} from '../contracts/examples/modules/finality/CallbackModule.sol';
 import {MultipleCallbacksModule} from '../contracts/examples/modules/finality/MultipleCallbacksModule.sol';
 import {ContractCallRequestModule} from '../contracts/examples/modules/request/ContractCallRequestModule.sol';
-import {CallbackModule} from '../contracts/modules/finality/CallbackModule.sol';
-import {HttpRequestModule} from '../contracts/modules/request/HttpRequestModule.sol';
+import {HttpRequestModule} from '../contracts/examples/modules/request/HttpRequestModule.sol';
 
 import {SparseMerkleTreeRequestModule} from '../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';
 
diff --git a/solidity/test/integration/HttpRequest.t.sol b/solidity/test/integration/HttpRequest.t.sol
index 331b0ca9..ed4de344 100644
--- a/solidity/test/integration/HttpRequest.t.sol
+++ b/solidity/test/integration/HttpRequest.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
+import {IHttpRequestModule} from '../../contracts/examples/modules/request/HttpRequestModule.sol';
 import './IntegrationBase.sol';
 
 contract Integration_HttpRequest is IntegrationBase {
diff --git a/solidity/test/integration/IntegrationBase.sol b/solidity/test/integration/IntegrationBase.sol
index 083a342c..4388c176 100644
--- a/solidity/test/integration/IntegrationBase.sol
+++ b/solidity/test/integration/IntegrationBase.sol
@@ -30,6 +30,7 @@ import {
   RootVerificationModule
 } from '../../contracts/examples/modules/dispute/RootVerificationModule.sol';
 
+import {CallbackModule, ICallbackModule} from '../../contracts/examples/modules/finality/CallbackModule.sol';
 import {
   IMultipleCallbacksModule,
   MultipleCallbacksModule
@@ -39,15 +40,14 @@ import {
   BondEscalationAccounting, IBondEscalationAccounting
 } from '../../contracts/extensions/BondEscalationAccounting.sol';
 import {BondEscalationModule, IBondEscalationModule} from '../../contracts/modules/dispute/BondEscalationModule.sol';
-import {CallbackModule, ICallbackModule} from '../../contracts/modules/finality/CallbackModule.sol';
 
 import {
   ISparseMerkleTreeRequestModule,
   SparseMerkleTreeRequestModule
 } from '../../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';
 
+import {HttpRequestModule, IHttpRequestModule} from '../../contracts/examples/modules/request/HttpRequestModule.sol';
 import {SparseMerkleTreeL32Verifier} from '../../contracts/examples/periphery/SparseMerkleTreeL32Verifier.sol';
-import {HttpRequestModule, IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
 import {ArbitratorModule, IArbitratorModule} from '../../contracts/modules/resolution/ArbitratorModule.sol';
 import {BondedResponseModule, IBondedResponseModule} from '../../contracts/modules/response/BondedResponseModule.sol';
 
diff --git a/solidity/test/unit/modules/finality/CallbackModule.t.sol b/solidity/test/unit/modules/finality/CallbackModule.t.sol
index d8880334..404ccef7 100644
--- a/solidity/test/unit/modules/finality/CallbackModule.t.sol
+++ b/solidity/test/unit/modules/finality/CallbackModule.t.sol
@@ -8,7 +8,7 @@ import {Helpers} from '../../../utils/Helpers.sol';
 import {IModule} from '@defi-wonderland/prophet-core/solidity/interfaces/IModule.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
-import {CallbackModule, ICallbackModule} from '../../../../contracts/modules/finality/CallbackModule.sol';
+import {CallbackModule, ICallbackModule} from '../../../../contracts/examples/modules/finality/CallbackModule.sol';
 
 import {IProphetCallback} from '../../../../interfaces/IProphetCallback.sol';
 
diff --git a/solidity/test/unit/modules/request/HttpRequestModule.t.sol b/solidity/test/unit/modules/request/HttpRequestModule.t.sol
index 2bceeb0c..f3a494eb 100644
--- a/solidity/test/unit/modules/request/HttpRequestModule.t.sol
+++ b/solidity/test/unit/modules/request/HttpRequestModule.t.sol
@@ -9,7 +9,9 @@ import {IModule} from '@defi-wonderland/prophet-core/solidity/interfaces/IModule
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
-import {HttpRequestModule, IHttpRequestModule} from '../../../../contracts/modules/request/HttpRequestModule.sol';
+import {
+  HttpRequestModule, IHttpRequestModule
+} from '../../../../contracts/examples/modules/request/HttpRequestModule.sol';
 
 import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';