diff --git a/Build/.eslintrc.json b/Build/.eslintrc.json
index 8a6cdb5027b6dca7ae669245a7f4d01ae3484f09..9960ae2dd02e6f081841856e023698398941227e 100644
--- a/Build/.eslintrc.json
+++ b/Build/.eslintrc.json
@@ -6,7 +6,7 @@
   },
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": true
+    "project": ["./tsconfig.eslint.json"]
   },
   "plugins": [
     "@typescript-eslint",
diff --git a/Build/tsconfig.eslint.json b/Build/tsconfig.eslint.json
new file mode 100644
index 0000000000000000000000000000000000000000..94523d84a74d69f1548d16be5937feb1a1b3c442
--- /dev/null
+++ b/Build/tsconfig.eslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig.json",
+    "include": [
+        "Sources/TypeScript/**/*.ts",
+        "types/**/*.ts"
+    ]
+}
diff --git a/Build/tsconfig.json b/Build/tsconfig.json
index 9d9a640ff8d26078a3bf2dee4fbb525879d5d525..e2858cd18dda4aae9b6958cab2490dd994bba1e2 100644
--- a/Build/tsconfig.json
+++ b/Build/tsconfig.json
@@ -100,17 +100,19 @@
             "d3-selection",
             "jasmine",
             "jquery",
+            "jquery-custom",
             "bootstrap",
             "nprogress",
             "requirejs",
-            "sortablejs"
+            "sortablejs",
+            "tablesort"
         ],
         "typeRoots": [
             "node_modules/@types",
             "types"
         ]
     },
-    "exclude": [
-        "composer/"
+    "include": [
+        "Sources/TypeScript/**/*.ts"
     ]
 }
diff --git a/Build/types/JQuery/draguploader.d.ts b/Build/types/jquery-custom/draguploader.d.ts
similarity index 100%
rename from Build/types/JQuery/draguploader.d.ts
rename to Build/types/jquery-custom/draguploader.d.ts
diff --git a/Build/types/JQuery/general.d.ts b/Build/types/jquery-custom/general.d.ts
similarity index 100%
rename from Build/types/JQuery/general.d.ts
rename to Build/types/jquery-custom/general.d.ts
diff --git a/Build/types/jquery-custom/index.d.ts b/Build/types/jquery-custom/index.d.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c7413500d9c46d354cc0332f1c0b9e652e06c08c
--- /dev/null
+++ b/Build/types/jquery-custom/index.d.ts
@@ -0,0 +1,4 @@
+import './draguploader';
+import './minicolors';
+import './general';
+import './paging';
diff --git a/Build/types/JQuery/minicolors.d.ts b/Build/types/jquery-custom/minicolors.d.ts
similarity index 100%
rename from Build/types/JQuery/minicolors.d.ts
rename to Build/types/jquery-custom/minicolors.d.ts
diff --git a/Build/types/JQuery/paging.d.ts b/Build/types/jquery-custom/paging.d.ts
similarity index 100%
rename from Build/types/JQuery/paging.d.ts
rename to Build/types/jquery-custom/paging.d.ts
diff --git a/Build/types/tablesort.d.ts b/Build/types/tablesort/index.d.ts
similarity index 100%
rename from Build/types/tablesort.d.ts
rename to Build/types/tablesort/index.d.ts