diff --git a/.jest.config.json b/.jest.config.json
index e8cd91a..5503c6a 100644
--- a/.jest.config.json
+++ b/.jest.config.json
@@ -2,7 +2,7 @@
     "clearMocks": true,
     "moduleNameMapper": {
         "@code/(.*)": [
-            "<rootDir>/src/day4/$1"
+            "<rootDir>/src/day6/$1"
         ]
     },
     "preset": "ts-jest"
diff --git a/package.json b/package.json
index 55b3307..03f78a5 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,6 @@
         "test": "jest ArrayList"
     },
     "kata_stats": {
-        "ArrayList": 2
+        "ArrayList": 4
     }
 }
\ No newline at end of file
diff --git a/scripts/dsa.js b/scripts/dsa.js
index a3090f4..eef52cb 100644
--- a/scripts/dsa.js
+++ b/scripts/dsa.js
@@ -2,40 +2,28 @@
 module.exports = {
     ArrayList: {
         type: "class",
-        name: "array-list.ts",
-        className: "ArrayList",
     },
     SinglyLinkedList: {
         type: "class",
-        name: "single-linked-list.ts",
-        className: "LinkedList",
     },
     DoublyLinkedList: {
         type: "class",
-        name: "doubly-linked-list.ts",
-        className: "LinkedList",
     },
     Queue: {
         type: "class",
-        name: "queue",
-        className: "Queue",
     },
-
     Stack: {
         type: "class",
-        name: "stack",
-        className: "Stack",
     },
+
     InsertionSort: {
         type: "fn",
-        name: "insertion-sort.ts",
         fn: "insertion_sort",
         args: "arr: number[]",
         "return": "void",
     },
     MergeSort: {
         type: "fn",
-        name: "merge-sort.ts",
         fn: "merge_sort",
         args: "arr: number[]",
         "return": "void",
diff --git a/scripts/generate b/scripts/generate
index 69069d5..e4c361a 100755
--- a/scripts/generate
+++ b/scripts/generate
@@ -29,16 +29,16 @@ const day_path = path.join(src_path, day_name);
 try { fs.unlinkSync(day_path); } catch (e) { }
 try { fs.mkdirSync(day_path); } catch (e) { }
 
-function create_class(item) {
-    fs.writeFileSync(path.join(day_path, item.name), `export default class ${item.className} {
+function create_class(name, item) {
+    fs.writeFileSync(path.join(day_path, `${name}.ts`), `export default class ${name} {
     constructor() {
 
     }
 }`);
 }
 
-function create_function(item) {
-    fs.writeFileSync(path.join(day_path, item.name), `export default function ${item.fn}(${item.args}): ${item.return} {
+function create_function(name, item) {
+    fs.writeFileSync(path.join(day_path, `${name}.ts`), `export default function ${item.fn}(${item.args}): ${item.return} {
 
 }`);
 }
@@ -46,9 +46,9 @@ function create_function(item) {
 config.dsa.forEach(ds => {
     const item = dsa[ds];
     if (item.type === "class") {
-        create_class(item);
+        create_class(ds, item);
     } else {
-        create_function(item);
+        create_function(ds, item);
     }
 });
 
diff --git a/src/__tests__/array-list.ts b/src/__tests__/ArrayList.ts
similarity index 100%
rename from src/__tests__/array-list.ts
rename to src/__tests__/ArrayList.ts
diff --git a/src/__tests__/doubly-linked-list.ts b/src/__tests__/DoublyLinkedList.ts
similarity index 100%
rename from src/__tests__/doubly-linked-list.ts
rename to src/__tests__/DoublyLinkedList.ts
diff --git a/src/__tests__/insertion-sort.ts b/src/__tests__/InsertionSort.ts
similarity index 100%
rename from src/__tests__/insertion-sort.ts
rename to src/__tests__/InsertionSort.ts
diff --git a/src/__tests__/merge-sort.ts b/src/__tests__/MergeSort.ts
similarity index 100%
rename from src/__tests__/merge-sort.ts
rename to src/__tests__/MergeSort.ts
diff --git a/src/__tests__/queue.ts b/src/__tests__/Queue.ts
similarity index 100%
rename from src/__tests__/queue.ts
rename to src/__tests__/Queue.ts
diff --git a/src/__tests__/singly-linked-list.ts b/src/__tests__/SinglyLinkedList.ts
similarity index 100%
rename from src/__tests__/singly-linked-list.ts
rename to src/__tests__/SinglyLinkedList.ts
diff --git a/src/__tests__/stack.ts b/src/__tests__/Stack.ts
similarity index 100%
rename from src/__tests__/stack.ts
rename to src/__tests__/Stack.ts
diff --git a/tsconfig.json b/tsconfig.json
index 0791ec0..9e25282 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,7 @@
         "baseUrl": "src",
         "paths": {
             "@code/*": [
-                "day4/*"
+                "day6/*"
             ]
         }
     },