diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 57ebaa84..00d3fe91 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -9,5 +9,5 @@ jobs:
     uses: mindee/mindee-api-nodejs/.github/workflows/_test-integrations.yml@main
     secrets: inherit
   test_code_samples:
-    uses: mindee/mindee-api-nodejs/.github/workflows/_test-code-samples.yml@main
+    uses: mindee/mindee-api-nodejs/.github/workflows/_test-smoke.yml@main
     secrets: inherit
diff --git a/package.json b/package.json
index 863b1c1e..e59dfbb4 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "test-integration-light": "mocha --grep '#OptionalDepsRequired' --invert 'tests/**/*.integration.ts'",
     "test-v2": "tsc --noEmit && node --import tsx --test 'tests/v2/**/*.spec.ts'",
     "lint": "tsc --noEmit && eslint --report-unused-disable-directives './src/**/*.ts' './tests/**/*.ts'",
-    "lint-fix": "eslint --fix --report-unused-disable-directives './src/**/*.ts' './tests/**/*.ts'",
+    "lint-fix": "tsc --noEmit && eslint --fix --report-unused-disable-directives './src/**/*.ts' './tests/**/*.ts'",
     "docs": "typedoc --out docs/_build ./src/index.ts",
     "docs-for-dist": "typedoc --out docs/_build ./src/index.ts && cp -r ./docs/code_samples ./docs/_build/"
   },
diff --git a/src/v2/client.ts b/src/v2/client.ts
index 7e3dfed1..0ec88443 100644
--- a/src/v2/client.ts
+++ b/src/v2/client.ts
@@ -7,7 +7,7 @@ import { LOG_LEVELS, logger } from "@/logger.js";
 import { ErrorResponse, JobResponse } from "./parsing/index.js";
 import { MindeeApiV2 } from "./http/mindeeApiV2.js";
 import { MindeeHttpErrorV2 } from "./http/errors.js";
-import { PollingOptions, PollingOptionsConstructor } from "./client/index.js";
+import { PollingOptions, PollingOptionsConstructor } from "./clientOptions/index.js";
 import { BaseProduct } from "@/v2/product/baseProduct.js";
 
 /**
diff --git a/src/v2/client/baseParameters.ts b/src/v2/clientOptions/baseParameters.ts
similarity index 100%
rename from src/v2/client/baseParameters.ts
rename to src/v2/clientOptions/baseParameters.ts
diff --git a/src/v2/client/index.ts b/src/v2/clientOptions/index.ts
similarity index 100%
rename from src/v2/client/index.ts
rename to src/v2/clientOptions/index.ts
diff --git a/src/v2/client/pollingOptions.ts b/src/v2/clientOptions/pollingOptions.ts
similarity index 100%
rename from src/v2/client/pollingOptions.ts
rename to src/v2/clientOptions/pollingOptions.ts
diff --git a/src/v2/http/mindeeApiV2.ts b/src/v2/http/mindeeApiV2.ts
index aeb35df7..2677cb58 100644
--- a/src/v2/http/mindeeApiV2.ts
+++ b/src/v2/http/mindeeApiV2.ts
@@ -1,6 +1,6 @@
 import { ApiSettings } from "./apiSettings.js";
 import { Dispatcher } from "undici";
-import { BaseParameters } from "@/v2/client/index.js";
+import { BaseParameters } from "@/v2/index.js";
 import {
   BaseResponse,
   ErrorResponse,
diff --git a/src/v2/index.ts b/src/v2/index.ts
index cb581049..d58f6d47 100644
--- a/src/v2/index.ts
+++ b/src/v2/index.ts
@@ -7,5 +7,5 @@ export {
   ErrorResponse,
   LocalResponse,
 } from "./parsing/index.js";
-export type { BaseParameters, TimerOptions } from "./client/index.js";
-export { PollingOptions } from "./client/index.js";
+export type { BaseParameters, TimerOptions } from "./clientOptions/index.js";
+export { PollingOptions } from "./clientOptions/index.js";
diff --git a/src/v2/product/baseProduct.ts b/src/v2/product/baseProduct.ts
index 649c372d..0ff28734 100644
--- a/src/v2/product/baseProduct.ts
+++ b/src/v2/product/baseProduct.ts
@@ -1,4 +1,4 @@
-import { BaseParameters } from "@/v2/client/index.js";
+import { BaseParameters } from "@/v2/index.js";
 import { ResponseConstructor } from "@/v2/parsing/index.js";
 
 /**
diff --git a/src/v2/product/classification/params/classificationParameters.ts b/src/v2/product/classification/params/classificationParameters.ts
index 41021cc3..acef9cbf 100644
--- a/src/v2/product/classification/params/classificationParameters.ts
+++ b/src/v2/product/classification/params/classificationParameters.ts
@@ -1,4 +1,4 @@
-import { BaseParameters, BaseParametersConstructor } from "@/v2/client/baseParameters.js";
+import { BaseParameters, BaseParametersConstructor } from "@/v2/clientOptions/baseParameters.js";
 import { logger } from "@/logger.js";
 
 /**
diff --git a/src/v2/product/crop/params/cropParameters.ts b/src/v2/product/crop/params/cropParameters.ts
index ba53eb1f..1c2a6fb9 100644
--- a/src/v2/product/crop/params/cropParameters.ts
+++ b/src/v2/product/crop/params/cropParameters.ts
@@ -1,4 +1,4 @@
-import { BaseParameters, BaseParametersConstructor } from "@/v2/client/baseParameters.js";
+import { BaseParameters, BaseParametersConstructor } from "@/v2/clientOptions/baseParameters.js";
 import { logger } from "@/logger.js";
 
 /**
diff --git a/src/v2/product/extraction/params/extractionParameters.ts b/src/v2/product/extraction/params/extractionParameters.ts
index 552791b5..6bb8124e 100644
--- a/src/v2/product/extraction/params/extractionParameters.ts
+++ b/src/v2/product/extraction/params/extractionParameters.ts
@@ -1,7 +1,7 @@
 import { FormData } from "undici";
 import { StringDict } from "@/parsing/stringDict.js";
 import { DataSchema } from "./dataSchema.js";
-import { BaseParameters, BaseParametersConstructor } from "@/v2/client/baseParameters.js";
+import { BaseParameters, BaseParametersConstructor } from "@/v2/clientOptions/baseParameters.js";
 import { logger } from "@/logger.js";
 
 /**
diff --git a/src/v2/product/ocr/params/ocrParameters.ts b/src/v2/product/ocr/params/ocrParameters.ts
index 94bbfbc0..340ec412 100644
--- a/src/v2/product/ocr/params/ocrParameters.ts
+++ b/src/v2/product/ocr/params/ocrParameters.ts
@@ -1,4 +1,4 @@
-import { BaseParameters, BaseParametersConstructor } from "@/v2/client/baseParameters.js";
+import { BaseParameters, BaseParametersConstructor } from "@/v2/clientOptions/baseParameters.js";
 import { logger } from "@/logger.js";
 
 /**
diff --git a/src/v2/product/split/params/splitParameters.ts b/src/v2/product/split/params/splitParameters.ts
index 71cc146e..d9a49d8c 100644
--- a/src/v2/product/split/params/splitParameters.ts
+++ b/src/v2/product/split/params/splitParameters.ts
@@ -1,7 +1,7 @@
 import {
   BaseParameters,
   BaseParametersConstructor,
-} from "@/v2/client/baseParameters.js";
+} from "@/v2/clientOptions/baseParameters.js";
 import { logger } from "@/logger.js";
 
 /**
diff --git a/tests/v2/client/pollingOptions.spec.ts b/tests/v2/client/pollingOptions.spec.ts
index 3b3ddf1b..385cde6b 100644
--- a/tests/v2/client/pollingOptions.spec.ts
+++ b/tests/v2/client/pollingOptions.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it } from "node:test";
 import assert from "node:assert/strict";
-import { PollingOptions } from "@/v2/client/index.js";
+import { PollingOptions } from "@/v2/index.js";
 import { MindeeConfigurationError } from "@/errors/index.js";
 
 describe("MindeeV2 - Polling Options", () => {