diff --git a/package.json b/package.json
index 339d0d78..401161cf 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "prepare": "husky",
     "precommit": "lint-staged",
     "lint": "eslint {src,tests}",
-    "tsc:build": "tsc -p tsconfig.cjs.json",
     "tsc:cp:files": "cp ./readme.md ./package*.json ./out/ && cp -R ./media ./out/",
     "tsc:postversion": "cp package.json .. && cp package-lock.json ..",
     "swc:build": "swc src --out-dir out",
diff --git a/src/index.ts b/src/index.ts
index 7adbe3b8..727b80d1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1 +1,40 @@
-export * from "./main/core.ts";
+import { Flow } from "./main/models/Flow";
+import { FlowAttribute } from "./main/models/FlowAttribute";
+import { FlowElement } from "./main/models/FlowElement";
+import { FlowNode } from "./main/models/FlowNode";
+import { FlowResource } from "./main/models/FlowResource";
+import { ResultDetails } from "./main/models/ResultDetails";
+import { RuleResult } from "./main/models/RuleResult";
+import { ScanResult } from "./main/models/ScanResult";
+import { FlowType } from "./main/models/FlowType";
+import { FlowVariable } from "./main/models/FlowVariable";
+import { ParsedFlow } from "./main/models/ParsedFlow";
+
+import { Compiler } from "./main/libs/Compiler";
+import { fix } from "./main/libs/FixFlows";
+import { getRules } from "./main/libs/GetRuleDefinitions";
+import { parse } from "./main/libs/ParseFlows";
+import { scan } from "./main/libs/ScanFlows";
+
+import type { IRulesConfig } from "./main/interfaces/IRulesConfig";
+import type { IRuleDefinition } from "./main/interfaces/IRuleDefinition";
+
+export {
+  Flow,
+  FlowAttribute,
+  FlowElement,
+  FlowNode,
+  FlowResource,
+  FlowType,
+  FlowVariable,
+  ScanResult,
+  RuleResult,
+  ResultDetails,
+  Compiler,
+  ParsedFlow,
+  getRules,
+  parse,
+  scan,
+  fix,
+};
+export type { IRuleDefinition, IRulesConfig };
diff --git a/src/main/core.ts b/src/main/core.ts
deleted file mode 100644
index af25d705..00000000
--- a/src/main/core.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Flow } from "./models/Flow";
-import { FlowAttribute } from "./models/FlowAttribute";
-import { FlowElement } from "./models/FlowElement";
-import { FlowNode } from "./models/FlowNode";
-import { FlowResource } from "./models/FlowResource";
-import { ResultDetails } from "./models/ResultDetails";
-import { RuleResult } from "./models/RuleResult";
-import { ScanResult } from "./models/ScanResult";
-import { FlowType } from "./models/FlowType";
-import { FlowVariable } from "./models/FlowVariable";
-
-import { Compiler } from "./libs/Compiler";
-import { fix } from "./libs/FixFlows";
-import { getRules } from "./libs/GetRuleDefinitions";
-import { parse } from "./libs/ParseFlows";
-import { scan } from "./libs/ScanFlows";
-
-import type { IRulesConfig } from "./interfaces/IRulesConfig";
-import type { IRuleDefinition } from "./interfaces/IRuleDefinition";
-
-export {
-  Flow,
-  FlowAttribute,
-  FlowElement,
-  FlowNode,
-  FlowResource,
-  FlowType,
-  FlowVariable,
-  ScanResult,
-  RuleResult,
-  ResultDetails,
-  Compiler,
-  getRules,
-  parse,
-  scan,
-  fix,
-};
-export type { IRuleDefinition, IRulesConfig };
diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
deleted file mode 100644
index b1525548..00000000
--- a/tsconfig.cjs.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
-    "resolveJsonModule": true,
-    "outDir": "out",
-    "lib": ["es2020.string", "es6"],
-    "experimentalDecorators": true,
-    "sourceMap": false,
-    "rootDir": "src",
-    "strict": false /* enable all strict type-checking options */,
-    "baseUrl": ".",
-    "declaration": true,
-    "esModuleInterop": true
-  },
-  "exclude": [
-    "node_modules",
-    "out/**",
-    ".idea/**",
-    "src/data/CustomRuleExample.ts",
-    "tests/**/*.test.ts",
-    "jest.config.ts"
-  ],
-}
diff --git a/tsconfig.types.json b/tsconfig.types.json
index dedaf547..44908198 100644
--- a/tsconfig.types.json
+++ b/tsconfig.types.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "ES6",
     "target": "es6",
-    "resolveJsonModule": true,
+    "moduleResolution": "node",
     "outDir": "types",
     "lib": ["es2020.string", "es6"],
     "experimentalDecorators": true,