diff --git a/contracts/Marketplace.sol b/contracts/Marketplace.sol
index 89601b6..3957e60 100644
--- a/contracts/Marketplace.sol
+++ b/contracts/Marketplace.sol
@@ -21,6 +21,19 @@ contract Marketplace is Collateral, Proofs, StateRetrieval {
   mapping(RequestId => RequestContext) private requestContexts;
   mapping(SlotId => Slot) private slots;
 
+  struct RequestContext {
+    RequestState state;
+    uint256 slotsFilled;
+    uint256 startedAt;
+    uint256 endsAt;
+  }
+
+  struct Slot {
+    SlotState state;
+    RequestId requestId;
+    address host;
+  }
+
   constructor(
     IERC20 token,
     MarketplaceConfig memory configuration
@@ -268,19 +281,6 @@ contract Marketplace is Collateral, Proofs, StateRetrieval {
     return slot.state;
   }
 
-  struct RequestContext {
-    RequestState state;
-    uint256 slotsFilled;
-    uint256 startedAt;
-    uint256 endsAt;
-  }
-
-  struct Slot {
-    SlotState state;
-    RequestId requestId;
-    address host;
-  }
-
   event StorageRequested(RequestId requestId, Ask ask);
   event RequestFulfilled(RequestId indexed requestId);
   event RequestFailed(RequestId indexed requestId);