diff --git a/twocaptcha/README.md b/twocaptcha/README.md
index c6facc3..9e4c079 100644
--- a/twocaptcha/README.md
+++ b/twocaptcha/README.md
@@ -5,11 +5,11 @@
 Docs: https://2captcha.com/api-docs
 
 ## Installation
-Via [npm](https://www.npmjs.com/package/@captcha-libs/twocaptcha)
+* [npm](https://www.npmjs.com/package/@captcha-libs/twocaptcha)
     ```$ npm i @captcha-libs/twocaptcha```
-pnpm
+* pnpm
     ```$ pnpm i @captcha-libs/twocaptcha```
-yarn
+* yarn
     ```$ yarn add @captcha-libs/twocaptcha```
 
 ### Usage
diff --git a/twocaptcha/package-lock.json b/twocaptcha/package-lock.json
index be6c56d..da78f25 100644
--- a/twocaptcha/package-lock.json
+++ b/twocaptcha/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@captcha-libs/twocaptcha",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@captcha-libs/twocaptcha",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "license": "ISC",
       "dependencies": {
         "@captcha-libs/captcha-client": "latest",
diff --git a/twocaptcha/package.json b/twocaptcha/package.json
index d33af6b..18b1ee4 100644
--- a/twocaptcha/package.json
+++ b/twocaptcha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@captcha-libs/twocaptcha",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "keywords": [
       "TwoCaptcha",
       "Captcha recognition",
diff --git a/twocaptcha/project.json b/twocaptcha/project.json
index 5bf4c05..60bd685 100644
--- a/twocaptcha/project.json
+++ b/twocaptcha/project.json
@@ -6,7 +6,8 @@
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "outputs": ["{options.outputFile}"],
+      "options": {"fix": true}
     },
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/twocaptcha/src/lib/Requests/Recognition/AudioTask.ts b/twocaptcha/src/lib/Requests/Recognition/AudioTask.ts
index e6f8074..e6b0d7b 100644
--- a/twocaptcha/src/lib/Requests/Recognition/AudioTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/AudioTask.ts
@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type AudioLangs = "de" | "el" | "en" | "fr" | "pt" | "ru";
diff --git a/twocaptcha/src/lib/Requests/Recognition/BoundingBoxTask.ts b/twocaptcha/src/lib/Requests/Recognition/BoundingBoxTask.ts
index 5d0c514..9575538 100644
--- a/twocaptcha/src/lib/Requests/Recognition/BoundingBoxTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/BoundingBoxTask.ts
@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 interface BoundingBoxTaskParams {
   body: string;
diff --git a/twocaptcha/src/lib/Requests/Recognition/CoordinatesTask.ts b/twocaptcha/src/lib/Requests/Recognition/CoordinatesTask.ts
index 8ddfc0a..1aa2524 100644
--- a/twocaptcha/src/lib/Requests/Recognition/CoordinatesTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/CoordinatesTask.ts
@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 type CoordinatesTaskParams = {
   body: string;
diff --git a/twocaptcha/src/lib/Requests/Recognition/DrawAroundTask.ts b/twocaptcha/src/lib/Requests/Recognition/DrawAroundTask.ts
index b64b9ae..51e6b36 100644
--- a/twocaptcha/src/lib/Requests/Recognition/DrawAroundTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/DrawAroundTask.ts
@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 interface DrawAroundTaskParams {
   body: string;
diff --git a/twocaptcha/src/lib/Requests/Recognition/GridTask.ts b/twocaptcha/src/lib/Requests/Recognition/GridTask.ts
index 7ea9d0d..5fe5bda 100644
--- a/twocaptcha/src/lib/Requests/Recognition/GridTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/GridTask.ts
@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 type GridTaskParams = {
   body: string;
diff --git a/twocaptcha/src/lib/Requests/Recognition/ImageToTextTask.ts b/twocaptcha/src/lib/Requests/Recognition/ImageToTextTask.ts
index 78a8029..8cffb4d 100644
--- a/twocaptcha/src/lib/Requests/Recognition/ImageToTextTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/ImageToTextTask.ts
@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 export enum NumericOptions {
diff --git a/twocaptcha/src/lib/Requests/Recognition/RotateTask.ts b/twocaptcha/src/lib/Requests/Recognition/RotateTask.ts
index 82bbe8e..1c78b0a 100644
--- a/twocaptcha/src/lib/Requests/Recognition/RotateTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/RotateTask.ts
@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type RotateTaskParams = Omit<BaseParams, "type"> & {
diff --git a/twocaptcha/src/lib/Requests/Recognition/TextCaptchaTask.ts b/twocaptcha/src/lib/Requests/Recognition/TextCaptchaTask.ts
index cf1da7d..b49e0ca 100644
--- a/twocaptcha/src/lib/Requests/Recognition/TextCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Recognition/TextCaptchaTask.ts
@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type TextCaptchaParams = Omit<BaseParams, "type"> & {
diff --git a/twocaptcha/src/lib/Requests/Token/AmazonTask.ts b/twocaptcha/src/lib/Requests/Token/AmazonTask.ts
index 2b71384..42d627f 100644
--- a/twocaptcha/src/lib/Requests/Token/AmazonTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/AmazonTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AmazonTaskBase, AmazonTaskBaseParams
-} from "./_AmazonTaskBase";
+import type { AmazonTaskBaseParams } from "./Base/_AmazonTaskBase";
+import { AmazonTaskBase } from "./Base/_AmazonTaskBase";
 
 type AmazonTaskParams = ProxyRequiredTaskParams<AmazonTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/AmazonTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/AmazonTaskProxyless.ts
index 712d202..3fc25d0 100644
--- a/twocaptcha/src/lib/Requests/Token/AmazonTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/AmazonTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AmazonTaskBase, AmazonTaskBaseParams
-} from "./_AmazonTaskBase";
+import type { AmazonTaskBaseParams } from "./Base/_AmazonTaskBase";
+import { AmazonTaskBase } from "./Base/_AmazonTaskBase";
 
 type AmazonTaskProxylessParams = ProxylessTaskParams<AmazonTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTask.ts b/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTask.ts
index e9565d3..667e275 100644
--- a/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AntiCyberSiAraTaskBase, AntiCyberSiAraTaskBaseParams
-} from "./_AntiCyberSiAraTaskBase";
+import type { AntiCyberSiAraTaskBaseParams } from "./Base/_AntiCyberSiAraTaskBase";
+import { AntiCyberSiAraTaskBase } from "./Base/_AntiCyberSiAraTaskBase";
 
 type AntiCyberSiAraTaskParams = ProxyRequiredTaskParams<AntiCyberSiAraTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTaskProxyless.ts
index 4483ed0..04b7ab3 100644
--- a/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AntiCyberSiAraTaskBase, AntiCyberSiAraTaskBaseParams
-} from "./_AntiCyberSiAraTaskBase";
+import type { AntiCyberSiAraTaskBaseParams } from "./Base/_AntiCyberSiAraTaskBase";
+import { AntiCyberSiAraTaskBase } from "./Base/_AntiCyberSiAraTaskBase";
 
 type AntiCyberSiAraTaskProxylessParams = ProxylessTaskParams<AntiCyberSiAraTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/_AmazonTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_AmazonTaskBase.ts
similarity index 95%
rename from twocaptcha/src/lib/Requests/Token/_AmazonTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_AmazonTaskBase.ts
index be7bf0e..42b15e4 100644
--- a/twocaptcha/src/lib/Requests/Token/_AmazonTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_AmazonTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type AmazonTaskBaseParams = Partial<ProxyCredentials> & {
   captchaScript?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_AntiCyberSiAraTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_AntiCyberSiAraTaskBase.ts
similarity index 94%
rename from twocaptcha/src/lib/Requests/Token/_AntiCyberSiAraTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_AntiCyberSiAraTaskBase.ts
index 3e3e3fa..529bc87 100644
--- a/twocaptcha/src/lib/Requests/Token/_AntiCyberSiAraTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_AntiCyberSiAraTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type AntiCyberSiAraTaskBaseParams = Partial<ProxyCredentials> & {
   SlideMasterUrlId: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_CapyTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_CapyTaskBase.ts
similarity index 94%
rename from twocaptcha/src/lib/Requests/Token/_CapyTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_CapyTaskBase.ts
index 20f3571..a9d72c3 100644
--- a/twocaptcha/src/lib/Requests/Token/_CapyTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_CapyTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type CapyTaskBaseParams = Partial<ProxyCredentials> & {
   userAgent?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_CutCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/Base/_CutCaptchaTask.ts
similarity index 94%
rename from twocaptcha/src/lib/Requests/Token/_CutCaptchaTask.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_CutCaptchaTask.ts
index 76878c2..74339d7 100644
--- a/twocaptcha/src/lib/Requests/Token/_CutCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_CutCaptchaTask.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type CutCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   apiKey: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_DataDomeSliderTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_DataDomeSliderTaskBase.ts
similarity index 95%
rename from twocaptcha/src/lib/Requests/Token/_DataDomeSliderTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_DataDomeSliderTaskBase.ts
index 911a406..ceceb36 100644
--- a/twocaptcha/src/lib/Requests/Token/_DataDomeSliderTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_DataDomeSliderTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyRequiredTaskParams, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyRequiredTaskParams, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
  type _DataDomeSliderTaskBaseParams = {
    captchaUrl: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_FriendlyCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/Base/_FriendlyCaptchaTask.ts
similarity index 93%
rename from twocaptcha/src/lib/Requests/Token/_FriendlyCaptchaTask.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_FriendlyCaptchaTask.ts
index ee08024..2e294b6 100644
--- a/twocaptcha/src/lib/Requests/Token/_FriendlyCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_FriendlyCaptchaTask.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type FriendlyCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   websiteKey: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_FunCaptchaTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_FunCaptchaTaskBase.ts
similarity index 96%
rename from twocaptcha/src/lib/Requests/Token/_FunCaptchaTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_FunCaptchaTaskBase.ts
index 653183a..19e195d 100644
--- a/twocaptcha/src/lib/Requests/Token/_FunCaptchaTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_FunCaptchaTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type FunCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   data?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_GeeTestTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestTaskBase.ts
similarity index 98%
rename from twocaptcha/src/lib/Requests/Token/_GeeTestTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_GeeTestTaskBase.ts
index d2c7cb4..013c025 100644
--- a/twocaptcha/src/lib/Requests/Token/_GeeTestTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestTaskBase.ts
@@ -1,9 +1,9 @@
 import type {
   ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+} from "../../_BaseTaskRequest";
 import {
   BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+} from "../../_BaseTaskRequest";
 
 export type GeetestV3TaskBaseParams = {
   challenge: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_GeeTestV3TaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestV3TaskBase.ts
similarity index 94%
rename from twocaptcha/src/lib/Requests/Token/_GeeTestV3TaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_GeeTestV3TaskBase.ts
index 00f172b..bbe251d 100644
--- a/twocaptcha/src/lib/Requests/Token/_GeeTestV3TaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestV3TaskBase.ts
@@ -1,7 +1,8 @@
-import {
-  BaseTask, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
-import { GeeTestV3TaskParams } from "./_GeeTestTaskBase";
+import type {
+  ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
+import type { GeeTestV3TaskParams } from "./_GeeTestTaskBase";
 
 /**
  * Base class for geetest
diff --git a/twocaptcha/src/lib/Requests/Token/_GeeTestV4TaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestV4TaskBase.ts
similarity index 92%
rename from twocaptcha/src/lib/Requests/Token/_GeeTestV4TaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_GeeTestV4TaskBase.ts
index 0f77736..9b700d2 100644
--- a/twocaptcha/src/lib/Requests/Token/_GeeTestV4TaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_GeeTestV4TaskBase.ts
@@ -1,7 +1,8 @@
-import {
-  BaseTask, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
-import { GeeTestV4TaskParams } from "./_GeeTestTaskBase";
+import type {
+  ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
+import type { GeeTestV4TaskParams } from "./_GeeTestTaskBase";
 
 /**
  * Base class for geetest
diff --git a/twocaptcha/src/lib/Requests/Token/_HCaptchaTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_HCaptchaTaskBase.ts
similarity index 96%
rename from twocaptcha/src/lib/Requests/Token/_HCaptchaTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_HCaptchaTaskBase.ts
index 426ccc2..1a36aed 100644
--- a/twocaptcha/src/lib/Requests/Token/_HCaptchaTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_HCaptchaTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type HCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   enterprisePayload?: Record<string, string>;
diff --git a/twocaptcha/src/lib/Requests/Token/_KeyCaptchaTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_KeyCaptchaTaskBase.ts
similarity index 95%
rename from twocaptcha/src/lib/Requests/Token/_KeyCaptchaTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_KeyCaptchaTaskBase.ts
index b8d2dd1..dfa4ec2 100644
--- a/twocaptcha/src/lib/Requests/Token/_KeyCaptchaTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_KeyCaptchaTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type KeyCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   s_s_c_session_id: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_LeminTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_LeminTaskBase.ts
similarity index 95%
rename from twocaptcha/src/lib/Requests/Token/_LeminTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_LeminTaskBase.ts
index 8722f97..2234777 100644
--- a/twocaptcha/src/lib/Requests/Token/_LeminTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_LeminTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type LeminTaskBaseParams = Partial<ProxyCredentials> & {
   captchaId: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_MtCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/Base/_MtCaptchaTask.ts
similarity index 93%
rename from twocaptcha/src/lib/Requests/Token/_MtCaptchaTask.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_MtCaptchaTask.ts
index 5709496..40b81fb 100644
--- a/twocaptcha/src/lib/Requests/Token/_MtCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_MtCaptchaTask.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type MtCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   websiteKey: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_RecaptchaV2TaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV2TaskBase.ts
similarity index 96%
rename from twocaptcha/src/lib/Requests/Token/_RecaptchaV2TaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV2TaskBase.ts
index 7bae479..bf84e69 100644
--- a/twocaptcha/src/lib/Requests/Token/_RecaptchaV2TaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV2TaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type RecaptchaV2TaskBaseParams = Partial<ProxyCredentials> & {
   apiDomain?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_RecaptchaV3TaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV3TaskBase.ts
similarity index 96%
rename from twocaptcha/src/lib/Requests/Token/_RecaptchaV3TaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV3TaskBase.ts
index a1307fc..f032ee7 100644
--- a/twocaptcha/src/lib/Requests/Token/_RecaptchaV3TaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV3TaskBase.ts
@@ -1,6 +1,7 @@
+import type { TaskTypes } from "../../_BaseTaskRequest";
 import {
-  BaseTask, ProxyCredentials, TaskTypes
-} from "../_BaseTaskRequest";
+  BaseTask, ProxyCredentials
+} from "../../_BaseTaskRequest";
 
 export type RecaptchaV3TaskBaseParams = {
   apiDomain?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/_TurnstileTaskBase.ts b/twocaptcha/src/lib/Requests/Token/Base/_TurnstileTaskBase.ts
similarity index 96%
rename from twocaptcha/src/lib/Requests/Token/_TurnstileTaskBase.ts
rename to twocaptcha/src/lib/Requests/Token/Base/_TurnstileTaskBase.ts
index 29a8a7e..8f7ac04 100644
--- a/twocaptcha/src/lib/Requests/Token/_TurnstileTaskBase.ts
+++ b/twocaptcha/src/lib/Requests/Token/Base/_TurnstileTaskBase.ts
@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type TurnstileTaskBaseParams = Partial<ProxyCredentials> & {
   action?: string;
diff --git a/twocaptcha/src/lib/Requests/Token/CapyTask.ts b/twocaptcha/src/lib/Requests/Token/CapyTask.ts
index 9771aaf..09fc865 100644
--- a/twocaptcha/src/lib/Requests/Token/CapyTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/CapyTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CapyTaskBase, CapyTaskBaseParams
-} from "./_CapyTaskBase";
+import type { CapyTaskBaseParams } from "./Base/_CapyTaskBase";
+import { CapyTaskBase } from "./Base/_CapyTaskBase";
 
 type CapyTaskParams = ProxyRequiredTaskParams<CapyTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/CapyTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/CapyTaskProxyless.ts
index fc37d1f..ea1e3e6 100644
--- a/twocaptcha/src/lib/Requests/Token/CapyTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/CapyTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CapyTaskBase, CapyTaskBaseParams
-} from "./_CapyTaskBase";
+import type { CapyTaskBaseParams } from "./Base/_CapyTaskBase";
+import { CapyTaskBase } from "./Base/_CapyTaskBase";
 
 type CapyTaskProxylessParams = ProxylessTaskParams<CapyTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/CutCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/CutCaptchaTask.ts
index 150b483..b5c1a55 100644
--- a/twocaptcha/src/lib/Requests/Token/CutCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/CutCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CutCaptchaTaskBase, CutCaptchaTaskBaseParams
-} from "./_CutCaptchaTask";
+import type { CutCaptchaTaskBaseParams } from "./Base/_CutCaptchaTask";
+import { CutCaptchaTaskBase } from "./Base/_CutCaptchaTask";
 
 type CutCaptchaTaskParams = ProxyRequiredTaskParams<CutCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/CutCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/CutCaptchaTaskProxyless.ts
index d16173a..c84e200 100644
--- a/twocaptcha/src/lib/Requests/Token/CutCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/CutCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CutCaptchaTaskBase, CutCaptchaTaskBaseParams
-} from "./_CutCaptchaTask";
+import type { CutCaptchaTaskBaseParams } from "./Base/_CutCaptchaTask";
+import { CutCaptchaTaskBase } from "./Base/_CutCaptchaTask";
 
 type CutCaptchaTaskProxylessParams = ProxylessTaskParams<CutCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/DataDomeSliderTask.ts b/twocaptcha/src/lib/Requests/Token/DataDomeSliderTask.ts
index e39b405..9633688 100644
--- a/twocaptcha/src/lib/Requests/Token/DataDomeSliderTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/DataDomeSliderTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  DataDomeSliderTaskBase, DataDomeSliderTaskBaseParams
-} from "./_DataDomeSliderTaskBase";
+import type { DataDomeSliderTaskBaseParams } from "./Base/_DataDomeSliderTaskBase";
+import { DataDomeSliderTaskBase } from "./Base/_DataDomeSliderTaskBase";
 
 type DataDomeSliderTaskParams = ProxyRequiredTaskParams<DataDomeSliderTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTask.ts
index 1a9367d..bf10737 100644
--- a/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  FriendlyCaptchaTaskBase, FriendlyCaptchaTaskBaseParams
-} from "./_FriendlyCaptchaTask";
+import type { FriendlyCaptchaTaskBaseParams } from "./Base/_FriendlyCaptchaTask";
+import { FriendlyCaptchaTaskBase } from "./Base/_FriendlyCaptchaTask";
 
 type FriendlyCaptchaTaskParams = ProxyRequiredTaskParams<FriendlyCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTaskProxyless.ts
index 2619626..bdb4ea5 100644
--- a/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/FriendlyCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  FriendlyCaptchaTaskBase, FriendlyCaptchaTaskBaseParams
-} from "./_FriendlyCaptchaTask";
+import type { FriendlyCaptchaTaskBaseParams } from "./Base/_FriendlyCaptchaTask";
+import { FriendlyCaptchaTaskBase } from "./Base/_FriendlyCaptchaTask";
 
 type FriendlyCaptchaTaskProxylessParams = ProxylessTaskParams<FriendlyCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/FunCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/FunCaptchaTask.ts
index 0df6f04..865cf5d 100644
--- a/twocaptcha/src/lib/Requests/Token/FunCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/FunCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  FunCaptchaTaskBase, FunCaptchaTaskBaseParams
-} from "./_FunCaptchaTaskBase";
+import type { FunCaptchaTaskBaseParams } from "./Base/_FunCaptchaTaskBase";
+import { FunCaptchaTaskBase } from "./Base/_FunCaptchaTaskBase";
 
 type FunCaptchaTaskParams = ProxyRequiredTaskParams<FunCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/FunCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/FunCaptchaTaskProxyless.ts
index 4c4fe78..63fc496 100644
--- a/twocaptcha/src/lib/Requests/Token/FunCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/FunCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  FunCaptchaTaskBase, FunCaptchaTaskBaseParams
-} from "./_FunCaptchaTaskBase";
+import type { FunCaptchaTaskBaseParams } from "./Base/_FunCaptchaTaskBase";
+import { FunCaptchaTaskBase } from "./Base/_FunCaptchaTaskBase";
 
 type FunCaptchaTaskProxylessParams = ProxylessTaskParams<FunCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestTask.ts b/twocaptcha/src/lib/Requests/Token/GeeTestTask.ts
index f5489f3..fd0fd05 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestTask.ts
@@ -1,10 +1,10 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
+import type {
   GeeTestV3TaskParams, GeeTestV4TaskParams
-} from "./_GeeTestTaskBase";
-import { GeeTestTaskBase } from "./_GeeTestTaskBase";
+} from "./Base/_GeeTestTaskBase";
+import { GeeTestTaskBase } from "./Base/_GeeTestTaskBase";
 
 type GeeTestTaskParams = ProxyRequiredTaskParams<GeeTestV3TaskParams | GeeTestV4TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/GeeTestTaskProxyless.ts
index e161f88..0f6d1e1 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestTaskProxyless.ts
@@ -1,10 +1,11 @@
-import {
-  ProxyCredentials, ProxylessTaskParams, _IsTaskType
+import type {
+  ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
+import { ProxyCredentials } from "../_BaseTaskRequest";
+import type {
   GeeTestV3TaskParams, GeeTestV4TaskParams
-} from "./_GeeTestTaskBase";
-import { GeeTestTaskBase } from "./_GeeTestTaskBase";
+} from "./Base/_GeeTestTaskBase";
+import { GeeTestTaskBase } from "./Base/_GeeTestTaskBase";
 
 type GeeTestTaskProxylessParams = ProxylessTaskParams<GeeTestV3TaskParams> | ProxylessTaskParams<GeeTestV4TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestV3Task.ts b/twocaptcha/src/lib/Requests/Token/GeeTestV3Task.ts
index fa43cc8..e700f5b 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestV3Task.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestV3Task.ts
@@ -1,8 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { GeeTestV3TaskParams as _GeeTestV3TaskParams } from "./_GeeTestTaskBase";
-import { GeeTestV3TaskBase } from "./_GeeTestV3TaskBase";
+import type { GeeTestV3TaskParams as _GeeTestV3TaskParams } from "./Base/_GeeTestTaskBase";
+import { GeeTestV3TaskBase } from "./Base/_GeeTestV3TaskBase";
 
 type GeeTestV3TaskParams = ProxyRequiredTaskParams<_GeeTestV3TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestV3TaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/GeeTestV3TaskProxyless.ts
index 4177842..ebb3c1f 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestV3TaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestV3TaskProxyless.ts
@@ -1,8 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { GeeTestV3TaskParams } from "./_GeeTestTaskBase";
-import { GeeTestV3TaskBase } from "./_GeeTestV3TaskBase";
+import type { GeeTestV3TaskParams } from "./Base/_GeeTestTaskBase";
+import { GeeTestV3TaskBase } from "./Base/_GeeTestV3TaskBase";
 
 type GeeTestV3TaskProxylessParams = ProxylessTaskParams<GeeTestV3TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestV4Task.ts b/twocaptcha/src/lib/Requests/Token/GeeTestV4Task.ts
index 9aae556..fdd4867 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestV4Task.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestV4Task.ts
@@ -1,8 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { GeeTestV4TaskParams as _GeeTestV4TaskParams } from "./_GeeTestTaskBase";
-import { GeeTestV4TaskBase } from "./_GeeTestV4TaskBase";
+import type { GeeTestV4TaskParams as _GeeTestV4TaskParams } from "./Base/_GeeTestTaskBase";
+import { GeeTestV4TaskBase } from "./Base/_GeeTestV4TaskBase";
 
 type GeeTestV4TaskParams = ProxyRequiredTaskParams<_GeeTestV4TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/GeeTestV4TaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/GeeTestV4TaskProxyless.ts
index 1036422..ce9406d 100644
--- a/twocaptcha/src/lib/Requests/Token/GeeTestV4TaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/GeeTestV4TaskProxyless.ts
@@ -1,8 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { GeeTestV4TaskParams as _GeeTestV4TaskParams } from "./_GeeTestTaskBase";
-import { GeeTestV4TaskBase } from "./_GeeTestV4TaskBase";
+import type { GeeTestV4TaskParams as _GeeTestV4TaskParams } from "./Base/_GeeTestTaskBase";
+import { GeeTestV4TaskBase } from "./Base/_GeeTestV4TaskBase";
 
 type GeeTestV4TaskProxylessParams = ProxylessTaskParams<_GeeTestV4TaskParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/HCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/HCaptchaTask.ts
index f5f66e1..b8df2c4 100644
--- a/twocaptcha/src/lib/Requests/Token/HCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/HCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  HCaptchaTaskBase, HCaptchaTaskBaseParams
-} from "./_HCaptchaTaskBase";
+import type { HCaptchaTaskBaseParams } from "./Base/_HCaptchaTaskBase";
+import { HCaptchaTaskBase } from "./Base/_HCaptchaTaskBase";
 
 type HCaptchaTaskParams = ProxyRequiredTaskParams<HCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/HCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/HCaptchaTaskProxyless.ts
index b716658..e522ca8 100644
--- a/twocaptcha/src/lib/Requests/Token/HCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/HCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  HCaptchaTaskBase, HCaptchaTaskBaseParams
-} from "./_HCaptchaTaskBase";
+import type { HCaptchaTaskBaseParams } from "./Base/_HCaptchaTaskBase";
+import { HCaptchaTaskBase } from "./Base/_HCaptchaTaskBase";
 
 type HCaptchaTaskProxylessParams = ProxylessTaskParams<HCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/KeyCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/KeyCaptchaTask.ts
index 4e21a59..f273b60 100644
--- a/twocaptcha/src/lib/Requests/Token/KeyCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/KeyCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  KeyCaptchaTaskBase, KeyCaptchaTaskBaseParams
-} from "./_KeyCaptchaTaskBase";
+import type { KeyCaptchaTaskBaseParams } from "./Base/_KeyCaptchaTaskBase";
+import { KeyCaptchaTaskBase } from "./Base/_KeyCaptchaTaskBase";
 
 type KeyCaptchaTaskParams = ProxyRequiredTaskParams<KeyCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/KeyCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/KeyCaptchaTaskProxyless.ts
index 008defc..578a076 100644
--- a/twocaptcha/src/lib/Requests/Token/KeyCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/KeyCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  KeyCaptchaTaskBase, KeyCaptchaTaskBaseParams
-} from "./_KeyCaptchaTaskBase";
+import type { KeyCaptchaTaskBaseParams } from "./Base/_KeyCaptchaTaskBase";
+import { KeyCaptchaTaskBase } from "./Base/_KeyCaptchaTaskBase";
 
 type KeyCaptchaTaskProxylessParams = ProxylessTaskParams<KeyCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/LeminTask.ts b/twocaptcha/src/lib/Requests/Token/LeminTask.ts
index 82095c4..7998ba4 100644
--- a/twocaptcha/src/lib/Requests/Token/LeminTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/LeminTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  LeminTaskBase, LeminTaskBaseParams
-} from "./_LeminTaskBase";
+import type { LeminTaskBaseParams } from "./Base/_LeminTaskBase";
+import { LeminTaskBase } from "./Base/_LeminTaskBase";
 
 type LeminTaskParams = ProxyRequiredTaskParams<LeminTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/LeminTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/LeminTaskProxyless.ts
index 721d67b..28de84d 100644
--- a/twocaptcha/src/lib/Requests/Token/LeminTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/LeminTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  LeminTaskBase, LeminTaskBaseParams
-} from "./_LeminTaskBase";
+import type { LeminTaskBaseParams } from "./Base/_LeminTaskBase";
+import { LeminTaskBase } from "./Base/_LeminTaskBase";
 
 type LeminTaskProxylessParams = ProxylessTaskParams<LeminTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/MtCaptchaTask.ts b/twocaptcha/src/lib/Requests/Token/MtCaptchaTask.ts
index 445781d..3a3c5bf 100644
--- a/twocaptcha/src/lib/Requests/Token/MtCaptchaTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/MtCaptchaTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  MtCaptchaTaskBase, MtCaptchaTaskBaseParams
-} from "./_MtCaptchaTask";
+import type { MtCaptchaTaskBaseParams } from "./Base/_MtCaptchaTask";
+import { MtCaptchaTaskBase } from "./Base/_MtCaptchaTask";
 
 type MtCaptchaTaskParams = ProxyRequiredTaskParams<MtCaptchaTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/MtCaptchaTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/MtCaptchaTaskProxyless.ts
index 544ef47..e005ef6 100644
--- a/twocaptcha/src/lib/Requests/Token/MtCaptchaTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/MtCaptchaTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CapyTaskBase, CapyTaskBaseParams
-} from "./_CapyTaskBase";
+import type { CapyTaskBaseParams } from "./Base/_CapyTaskBase";
+import { CapyTaskBase } from "./Base/_CapyTaskBase";
 
 type MtCaptchaTaskProxylessParams = ProxylessTaskParams<CapyTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTask.ts b/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTask.ts
index 2f330c4..7dd9d4a 100644
--- a/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  RecaptchaV2TaskBase, RecaptchaV2TaskBaseParams
-} from "./_RecaptchaV2TaskBase";
+import type { RecaptchaV2TaskBaseParams } from "./Base/_RecaptchaV2TaskBase";
+import { RecaptchaV2TaskBase } from "./Base/_RecaptchaV2TaskBase";
 
 export interface _RecaptchaV2EnterpriseTaskParams {
   enterprisePayload?: Record<string, string>;
diff --git a/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTaskProxyless.ts
index 27872a2..e8b878e 100644
--- a/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/RecaptchaV2EnterpriseTaskProxyless.ts
@@ -1,10 +1,9 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { _RecaptchaV2EnterpriseTaskParams } from "./RecaptchaV2EnterpriseTask";
-import {
-  RecaptchaV2TaskBase, RecaptchaV2TaskBaseParams
-} from "./_RecaptchaV2TaskBase";
+import type { _RecaptchaV2EnterpriseTaskParams } from "./RecaptchaV2EnterpriseTask";
+import type { RecaptchaV2TaskBaseParams } from "./Base/_RecaptchaV2TaskBase";
+import { RecaptchaV2TaskBase } from "./Base/_RecaptchaV2TaskBase";
 
 type RecaptchaV2EnterpriseTaskProxylessParams = _RecaptchaV2EnterpriseTaskParams & ProxylessTaskParams<RecaptchaV2TaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/RecaptchaV2Task.ts b/twocaptcha/src/lib/Requests/Token/RecaptchaV2Task.ts
index 0a87633..045a130 100644
--- a/twocaptcha/src/lib/Requests/Token/RecaptchaV2Task.ts
+++ b/twocaptcha/src/lib/Requests/Token/RecaptchaV2Task.ts
@@ -1,8 +1,7 @@
-import { _IsTaskType } from "./../_BaseTaskRequest";
-import { ProxyRequiredTaskParams } from "../_BaseTaskRequest";
-import {
-  RecaptchaV2TaskBase, RecaptchaV2TaskBaseParams
-} from "./_RecaptchaV2TaskBase";
+import type { _IsTaskType } from "./../_BaseTaskRequest";
+import type { ProxyRequiredTaskParams } from "../_BaseTaskRequest";
+import type { RecaptchaV2TaskBaseParams } from "./Base/_RecaptchaV2TaskBase";
+import { RecaptchaV2TaskBase } from "./Base/_RecaptchaV2TaskBase";
 
 type RecaptchaV2TaskParams = ProxyRequiredTaskParams<RecaptchaV2TaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/RecaptchaV2TaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/RecaptchaV2TaskProxyless.ts
index da2a508..e860f30 100644
--- a/twocaptcha/src/lib/Requests/Token/RecaptchaV2TaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/RecaptchaV2TaskProxyless.ts
@@ -1,8 +1,9 @@
-import {
-  ProxyCredentials, ProxylessTaskParams, _IsTaskType
+import type {
+  ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import { RecaptchaV2TaskBase } from "./_RecaptchaV2TaskBase";
-import { RecaptchaV2TaskBaseParams } from "./_RecaptchaV2TaskBase";
+import { ProxyCredentials } from "../_BaseTaskRequest";
+import { RecaptchaV2TaskBase } from "./Base/_RecaptchaV2TaskBase";
+import type { RecaptchaV2TaskBaseParams } from "./Base/_RecaptchaV2TaskBase";
 
 type RecaptchaV2TaskProxylessParams = ProxylessTaskParams<RecaptchaV2TaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/RecaptchaV3TaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/RecaptchaV3TaskProxyless.ts
index e1f6528..67c1f42 100644
--- a/twocaptcha/src/lib/Requests/Token/RecaptchaV3TaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/RecaptchaV3TaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  RecaptchaV3TaskBase, RecaptchaV3TaskBaseParams
-} from "./_RecaptchaV3TaskBase";
+import type { RecaptchaV3TaskBaseParams } from "./Base/_RecaptchaV3TaskBase";
+import { RecaptchaV3TaskBase } from "./Base/_RecaptchaV3TaskBase";
 
 type RecaptchaV3TaskProxylessParams = ProxylessTaskParams<RecaptchaV3TaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/TurnstileTask.ts b/twocaptcha/src/lib/Requests/Token/TurnstileTask.ts
index 98f6dca..3be8438 100644
--- a/twocaptcha/src/lib/Requests/Token/TurnstileTask.ts
+++ b/twocaptcha/src/lib/Requests/Token/TurnstileTask.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  TurnstileTaskBase, TurnstileTaskBaseParams
-} from "./_TurnstileTaskBase";
+import type { TurnstileTaskBaseParams } from "./Base/_TurnstileTaskBase";
+import { TurnstileTaskBase } from "./Base/_TurnstileTaskBase";
 
 type TurnstileTaskParams = ProxyRequiredTaskParams<TurnstileTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/Token/TurnstileTaskProxyless.ts b/twocaptcha/src/lib/Requests/Token/TurnstileTaskProxyless.ts
index f7da856..7b36dd6 100644
--- a/twocaptcha/src/lib/Requests/Token/TurnstileTaskProxyless.ts
+++ b/twocaptcha/src/lib/Requests/Token/TurnstileTaskProxyless.ts
@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  TurnstileTaskBase, TurnstileTaskBaseParams
-} from "./_TurnstileTaskBase";
+import type { TurnstileTaskBaseParams } from "./Base/_TurnstileTaskBase";
+import { TurnstileTaskBase } from "./Base/_TurnstileTaskBase";
 
 type TurnstileTaskProxylessParams = ProxylessTaskParams<TurnstileTaskBaseParams>;
 
diff --git a/twocaptcha/src/lib/Requests/_BaseTaskRequest.ts b/twocaptcha/src/lib/Requests/_BaseTaskRequest.ts
index d6d91cf..d5d9956 100644
--- a/twocaptcha/src/lib/Requests/_BaseTaskRequest.ts
+++ b/twocaptcha/src/lib/Requests/_BaseTaskRequest.ts
@@ -1,4 +1,3 @@
-
 const _TaskTypes = [
   "ImageToTextTask",
   "TextCaptchaTask",
diff --git a/twocaptcha/src/lib/Requests/index.ts b/twocaptcha/src/lib/Requests/index.ts
index a1dd1aa..cad99ed 100644
--- a/twocaptcha/src/lib/Requests/index.ts
+++ b/twocaptcha/src/lib/Requests/index.ts
@@ -1,7 +1,7 @@
-import {
+import type {
   AudioTask, BoundingBoxTask, CoordinatesTask, DrawAroundTask, GridTask, ImageToTextTask, RotateTask, TextCaptchaTask
 } from "./Recognition";
-import {
+import type {
   AmazonTask, AmazonTaskProxyless, AntiCyberSiAraTask, AntiCyberSiAraTaskProxyless, CapyTask, CapyTaskProxyless, CutCaptchaTask, CutCaptchaTaskProxyless, DataDomeSliderTask, FriendlyCaptchaTask, FriendlyCaptchaTaskProxyless, FunCaptchaTask, FunCaptchaTaskProxyless, GeeTestTask, GeeTestTaskProxyless, GeeTestV3Task, GeeTestV3TaskProxyless, GeeTestV4Task, GeeTestV4TaskProxyless, HCaptchaTask, HCaptchaTaskProxyless, KeyCaptchaTask, KeyCaptchaTaskProxyless, LeminTask, LeminTaskProxyless, MtCaptchaTask, MtCaptchaTaskProxyless, RecaptchaV2EnterpriseTask, RecaptchaV2EnterpriseTaskProxyless, RecaptchaV2Task, RecaptchaV2TaskProxyless, RecaptchaV3TaskProxyless, TurnstileTask, TurnstileTaskProxyless
 } from "./Token";
 
diff --git a/twocaptcha/src/lib/Solutions/Token/GeeTestTaskSolution.ts b/twocaptcha/src/lib/Solutions/Token/GeeTestTaskSolution.ts
index 111c2a7..43a3314 100644
--- a/twocaptcha/src/lib/Solutions/Token/GeeTestTaskSolution.ts
+++ b/twocaptcha/src/lib/Solutions/Token/GeeTestTaskSolution.ts
@@ -1,4 +1,4 @@
-import { GeeTestV4TaskSolution } from "./GeeTestV4TaskSolution";
-import { GeeTestV3TaskSolution } from "./GeeTestV3TaskSolution";
+import type { GeeTestV4TaskSolution } from "./GeeTestV4TaskSolution";
+import type { GeeTestV3TaskSolution } from "./GeeTestV3TaskSolution";
 
 export type GeeTestTaskSolution = GeeTestV3TaskSolution & GeeTestV4TaskSolution;
\ No newline at end of file
diff --git a/twocaptcha/src/lib/Solutions/_BaseSolution.ts b/twocaptcha/src/lib/Solutions/_BaseSolution.ts
index d5b7ea2..fe17d7c 100644
--- a/twocaptcha/src/lib/Solutions/_BaseSolution.ts
+++ b/twocaptcha/src/lib/Solutions/_BaseSolution.ts
@@ -1,4 +1,4 @@
-import { TwoCaptchaErrorResponse } from "../types";
+import type { TwoCaptchaErrorResponse } from "../types";
 
 export type TwoCaptchaSuccessSolution<TSolution> = {
   cost: string;
diff --git a/twocaptcha/src/lib/twocaptcha.ts b/twocaptcha/src/lib/twocaptcha.ts
index 5487ea9..8303d36 100644
--- a/twocaptcha/src/lib/twocaptcha.ts
+++ b/twocaptcha/src/lib/twocaptcha.ts
@@ -8,7 +8,7 @@ import {
 import type {
   TwoCaptchaCreateTaskResponse, CaptchaClientParams, TwoCaptchaBalanceResponse, TwoCaptchaSuccessResponse, TwoCaptchaReportTaskResponse, TwoCaptchaReportTaskSuccessResponse
 } from "./types";
-import {
+import type {
   AmazonTask,
   AmazonTaskProxyless,
   AntiCyberSiAraTask,
@@ -53,10 +53,10 @@ import {
   CutCaptchaTask,
   CutCaptchaTaskProxyless
 } from "./Requests";
-import {
+import type {
   TwoCaptchaSolution, TwoCaptchaSuccessSolution
 } from "./Solutions/_BaseSolution";
-import {
+import type {
   AudioTaskSolution,
   BoundingBoxTaskSolution,
   CoordinatesTaskSolution,
@@ -82,7 +82,7 @@ import {
   TurnstileTaskSolution,
   ImageToTextTaskSolution
 } from "./Solutions";
-import { CutCaptchaTaskSolution } from "./Solutions/Token/CutCaptchaTaskSolution";
+import type { CutCaptchaTaskSolution } from "./Solutions/Token/CutCaptchaTaskSolution";
 process.removeAllListeners("warning");
 
 /**