diff --git a/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/package.json b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/package.json
index ba96020d9..18c602682 100644
--- a/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/package.json
+++ b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@xyo-network/diviner-model": "^2.83.2",
+    "@xyo-network/module-model": "^2.83.2",
     "@xyo-network/payload-model": "^2.83.2",
     "@xyo-network/payload-plugin": "^2.83.2",
     "@xyo-network/witness-model": "^2.83.2",
diff --git a/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Labels.ts b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Labels.ts
new file mode 100644
index 000000000..142766d6e
--- /dev/null
+++ b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Labels.ts
@@ -0,0 +1,15 @@
+import { Labels } from '@xyo-network/module-model'
+
+/**
+ * Labels for Crypto Contract Diviner components
+ */
+export interface CryptoContractDivinerLabels extends Labels {
+  'network.xyo.crypto.contract.info': 'diviner'
+}
+
+/**
+ * Labels for Crypto Contract Diviner components
+ */
+export const CryptoContractDivinerLabels: CryptoContractDivinerLabels = {
+  'network.xyo.crypto.contract.info': 'diviner',
+}
diff --git a/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/index.ts b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/index.ts
index 9d163fa08..bdf19ff15 100644
--- a/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/index.ts
+++ b/packages/payload/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/index.ts
@@ -1,4 +1,5 @@
 export * from './Config'
+export * from './Labels'
 export * from './Params'
 export * from './Payload'
 export * from './Schema'
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Diviner.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Diviner.ts
index 873cd76dc..8f2c05b88 100644
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Diviner.ts
+++ b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Diviner/Diviner.ts
@@ -6,6 +6,7 @@ import {
   ContractInfo,
   ContractInfoSchema,
   CryptoContractDivinerConfigSchema,
+  CryptoContractDivinerLabels,
   CryptoContractDivinerParams,
   CryptoContractFunctionCallResult,
   CryptoContractFunctionCallResultSchema,
@@ -16,6 +17,7 @@ export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPa
 
 export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {
   static override configSchemas = [CryptoContractDivinerConfigSchema]
+  static labels: CryptoContractDivinerLabels = CryptoContractDivinerLabels
 
   protected static findCallResult<TResult = string>(
     address: string,
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Diviner.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Diviner.ts
deleted file mode 100644
index ad1d17427..000000000
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Diviner.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IndexingDiviner } from '@xyo-network/diviner-indexing'
-
-import { CryptoContractIndexingDivinerLabels } from './Labels'
-
-export class CryptoContractIndexingDiviner extends IndexingDiviner {
-  static labels: CryptoContractIndexingDivinerLabels = CryptoContractIndexingDivinerLabels
-}
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Labels.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Labels.ts
deleted file mode 100644
index fe4be3c60..000000000
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/Labels.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { DivinerStageSchema, IndexingDivinerStage } from '@xyo-network/diviner-indexing'
-import { Labels } from '@xyo-network/module-model'
-
-/**
- * Labels for Image Thumbnail Diviner components
- */
-export interface CryptoContractIndexingDivinerLabels extends Labels {
-  'network.xyo.crypto.contract.info': 'diviner'
-}
-
-/**
- * Labels for Image Thumbnail Diviner components
- */
-export const CryptoContractIndexingDivinerLabels: CryptoContractIndexingDivinerLabels = {
-  'network.xyo.crypto.contract.info': 'diviner',
-}
-
-/**
- * Labels for Image Thumbnail Diviner Stage Diviners
- */
-export type CryptoContractIndexingDivinerStageLabels = CryptoContractIndexingDivinerLabels & {
-  /**
-   * Labels for the stage of the Image Thumbnail Diviner Stage Diviner
-   */
-  [key in DivinerStageSchema]: IndexingDivinerStage
-}
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/index.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/index.ts
deleted file mode 100644
index 4304dc9ca..000000000
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Index/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Diviner'
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Erc721Sentinel.json b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Erc721Sentinel.json
similarity index 100%
rename from packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/Erc721Sentinel.json
rename to packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Erc721Sentinel.json
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.collection.spec.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.collection.spec.ts
index 4ae6b505b..b795912f8 100644
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.collection.spec.ts
+++ b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.collection.spec.ts
@@ -1,7 +1,12 @@
 /* eslint-disable max-statements */
 
 import { HDWallet } from '@xyo-network/account'
-import { CryptoContractFunctionCall, CryptoContractFunctionCallSchema } from '@xyo-network/crypto-contract-function-read-payload-plugin'
+import {
+  ContractInfo,
+  ContractInfoSchema,
+  CryptoContractFunctionCall,
+  CryptoContractFunctionCallSchema,
+} from '@xyo-network/crypto-contract-function-read-payload-plugin'
 import { asDivinerInstance } from '@xyo-network/diviner-model'
 import { ManifestWrapper, PackageManifestPayload } from '@xyo-network/manifest'
 import { ModuleFactory, ModuleFactoryLocator } from '@xyo-network/module-model'
@@ -12,9 +17,9 @@ import { getProviderFromEnv } from '@xyo-network/witness-blockchain-abstract'
 import { asWitnessInstance } from '@xyo-network/witness-model'
 import { Provider } from 'ethers'
 
-import { ContractInfo, ContractInfoSchema, CryptoContractDiviner } from '../Diviner'
-import erc721SentinelManifest from '../Erc721Sentinel.json'
+import { CryptoContractDiviner } from '../Diviner'
 import { CryptoContractFunctionReadWitness } from '../Witness'
+import erc721SentinelManifest from './Erc721Sentinel.json'
 
 const profileData: Record<string, number[]> = {}
 
diff --git a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.token.spec.ts b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.token.spec.ts
index ab27354a5..420d2161d 100644
--- a/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.token.spec.ts
+++ b/packages/payloadset/packages/crypto/packages/nft/packages/contract/packages/function-read/src/spec/Sentinel.token.spec.ts
@@ -3,6 +3,8 @@
 import { hexFromHexString } from '@xylabs/hex'
 import { HDWallet } from '@xyo-network/account'
 import {
+  ContractInfo,
+  ContractInfoSchema,
   CryptoContractFunctionCall,
   CryptoContractFunctionCallResultSchema,
   CryptoContractFunctionCallSchema,
@@ -18,9 +20,9 @@ import { asWitnessInstance } from '@xyo-network/witness-model'
 import { Semaphore } from 'async-mutex'
 import { Provider } from 'ethers'
 
-import { ContractInfo, ContractInfoSchema, CryptoContractDiviner } from '../Diviner'
-import erc721SentinelManifest from '../Erc721Sentinel.json'
+import { CryptoContractDiviner } from '../Diviner'
 import { CryptoContractFunctionReadWitness } from '../Witness'
+import erc721SentinelManifest from './Erc721Sentinel.json'
 
 const profileData: Record<string, number[]> = {}
 
diff --git a/yarn.lock b/yarn.lock
index 8ef827042..81444b145 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4326,6 +4326,7 @@ __metadata:
     "@xylabs/ts-scripts-yarn3": "npm:^3.2.10"
     "@xylabs/tsconfig": "npm:^3.2.10"
     "@xyo-network/diviner-model": "npm:^2.83.2"
+    "@xyo-network/module-model": "npm:^2.83.2"
     "@xyo-network/payload-model": "npm:^2.83.2"
     "@xyo-network/payload-plugin": "npm:^2.83.2"
     "@xyo-network/witness-model": "npm:^2.83.2"