diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-1.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-2.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-2.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-3.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-3.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-4-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-4-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-4-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-4-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-4.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-4.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-4.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-4.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-5-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-5-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-5-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-5-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-5.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-5.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-5.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-5.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-6-expected.txt b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-6-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-6-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-6-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-6.ts b/es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-6.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-class-element-6.ts
rename to es2panda/test/compiler/ts/cases/compiler/class-element/test-ts-class-element-6.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-declare-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/declare/test-ts-declare-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-declare-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/declare/test-ts-declare-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-declare-1.ts b/es2panda/test/compiler/ts/cases/compiler/declare/test-ts-declare-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-declare-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/declare/test-ts-declare-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-conditional-expression-expected.txt b/es2panda/test/compiler/ts/cases/compiler/expression/conditional/test-conditional-expression-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-conditional-expression-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/expression/conditional/test-conditional-expression-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-conditional-expression.ts b/es2panda/test/compiler/ts/cases/compiler/expression/conditional/test-conditional-expression.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-conditional-expression.ts
rename to es2panda/test/compiler/ts/cases/compiler/expression/conditional/test-conditional-expression.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-arrow-function-destructuring-pattern-expected.txt b/es2panda/test/compiler/ts/cases/compiler/function/arrow/test-ts-arrow-function-destructuring-pattern-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-arrow-function-destructuring-pattern-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/function/arrow/test-ts-arrow-function-destructuring-pattern-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-arrow-function-destructuring-pattern.ts b/es2panda/test/compiler/ts/cases/compiler/function/arrow/test-ts-arrow-function-destructuring-pattern.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-arrow-function-destructuring-pattern.ts
rename to es2panda/test/compiler/ts/cases/compiler/function/arrow/test-ts-arrow-function-destructuring-pattern.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-1.ts b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-2.ts b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-2.ts
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-3.ts b/es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-index-signature-3.ts
rename to es2panda/test/compiler/ts/cases/compiler/index-signature/test-ts-index-signature-3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-1.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-10-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-10-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-10-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-10-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-10.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-10.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-10.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-10.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-11-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-11-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-11-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-11-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-11.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-11.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-11.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-11.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-12-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-12-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-12-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-12-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-12.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-12.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-12.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-12.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-13-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-13-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-13-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-13-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-13.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-13.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-13.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-13.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-14-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-14-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-14-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-14-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-14.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-14.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-14.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-14.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-15-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-15-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-15-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-15-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-15.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-15.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-15.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-15.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-16-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-16-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-16-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-16-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-16.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-16.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-16.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-16.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-17-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-17-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-17-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-17-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-17.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-17.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-17.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-17.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-18-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-18-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-18-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-18-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-18.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-18.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-18.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-18.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-19-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-19-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-19-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-19-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-19.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-19.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-19.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-19.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-2.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-2.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-20-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-20-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-20-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-20-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-20.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-20.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-20.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-20.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-21-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-21-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-21-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-21-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-21.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-21.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-21.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-21.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-22-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-22-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-22-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-22-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-22.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-22.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-22.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-22.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-3.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-3.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-4-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-4-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-4-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-4-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-4.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-4.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-4.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-4.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-5-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-5-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-5-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-5-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-5.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-5.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-5.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-5.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-6-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-6-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-6-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-6-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-6.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-6.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-6.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-6.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-7-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-7-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-7-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-7-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-7.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-7.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-7.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-7.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-8-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-8-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-8-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-8-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-8.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-8.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-8.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-8.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-9-expected.txt b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-9-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-9-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-9-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-9.ts b/es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-9.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-namespace-9.ts
rename to es2panda/test/compiler/ts/cases/compiler/namespace/test-ts-namespace-9.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-non-null-assertion-expected.txt b/es2panda/test/compiler/ts/cases/compiler/non-null-assertion/test-ts-non-null-assertion-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-non-null-assertion-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/non-null-assertion/test-ts-non-null-assertion-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-non-null-assertion.ts b/es2panda/test/compiler/ts/cases/compiler/non-null-assertion/test-ts-non-null-assertion.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-non-null-assertion.ts
rename to es2panda/test/compiler/ts/cases/compiler/non-null-assertion/test-ts-non-null-assertion.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-generic-tag-template-string-escape-error-expected.txt b/es2panda/test/compiler/ts/cases/compiler/others/test-ts-generic-tag-template-string-escape-error-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-generic-tag-template-string-escape-error-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/others/test-ts-generic-tag-template-string-escape-error-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-generic-tag-template-string-escape-error.ts b/es2panda/test/compiler/ts/cases/compiler/others/test-ts-generic-tag-template-string-escape-error.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-generic-tag-template-string-escape-error.ts
rename to es2panda/test/compiler/ts/cases/compiler/others/test-ts-generic-tag-template-string-escape-error.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-typeof-returntype-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/others/test-ts-typeof-returntype-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-typeof-returntype-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/others/test-ts-typeof-returntype-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-typeof-returntype-1.ts b/es2panda/test/compiler/ts/cases/compiler/others/test-ts-typeof-returntype-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-typeof-returntype-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/others/test-ts-typeof-returntype-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-override-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/override/test-ts-override-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-override-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/override/test-ts-override-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-override-1.ts b/es2panda/test/compiler/ts/cases/compiler/override/test-ts-override-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-override-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/override/test-ts-override-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/ts-print-test-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/print/ts-print-test-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/ts-print-test-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/print/ts-print-test-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/ts-print-test-1.ts b/es2panda/test/compiler/ts/cases/compiler/print/ts-print-test-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/ts-print-test-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/print/ts-print-test-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-1.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-10-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-10-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-10-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-10-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-10.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-10.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-10.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-10.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-11-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-11-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-11-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-11-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-11.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-11.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-11.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-11.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-12-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-12-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-12-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-12-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-12.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-12.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-12.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-12.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-2.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-2.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-3.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-3.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-4-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-4-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-4-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-4-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-4.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-4.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-4.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-4.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-5-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-5-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-5-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-5-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-5.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-5.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-5.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-5.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-6-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-6-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-6-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-6-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-6.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-6.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-6.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-6.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-7-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-7-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-7-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-7-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-7.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-7.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-7.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-7.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-8-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-8-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-8-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-8-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-8.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-8.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-8.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-8.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-9-expected.txt b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-9-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-9-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-9-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-9.ts b/es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-9.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-private-class-element-9.ts
rename to es2panda/test/compiler/ts/cases/compiler/private-class-element/test-ts-private-class-element-9.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-1.ts b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-2.ts b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-2.ts
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-3.ts b/es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-satisfies-3.ts
rename to es2panda/test/compiler/ts/cases/compiler/satisfies/test-ts-satisfies-3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-if-statement-1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/statement/if/test-ts-if-statement-1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-if-statement-1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/statement/if/test-ts-if-statement-1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-if-statement-1.ts b/es2panda/test/compiler/ts/cases/compiler/statement/if/test-ts-if-statement-1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-if-statement-1.ts
rename to es2panda/test/compiler/ts/cases/compiler/statement/if/test-ts-if-statement-1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class1-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class1-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class1-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class1-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class1.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class1.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class1.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class1.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class10-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class10-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class10-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class10-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class10.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class10.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class10.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class10.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class11-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class11-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class11-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class11-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class11.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class11.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class11.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class11.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class12-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class12-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class12-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class12-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class12.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class12.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class12.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class12.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class13-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class13-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class13-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class13-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class13.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class13.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class13.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class13.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class14-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class14-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class14-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class14-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class14.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class14.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class14.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class14.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class2-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class2-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class2-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class2-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class2.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class2.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class2.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class2.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class3-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class3-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class3-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class3-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class3.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class3.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class3.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class3.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class4-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class4-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class4-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class4-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class4.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class4.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class4.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class4.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class5-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class5-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class5-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class5-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class5.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class5.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class5.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class5.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class6-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class6-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class6-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class6-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class6.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class6.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class6.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class6.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class7-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class7-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class7-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class7-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class7.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class7.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class7.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class7.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class8-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class8-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class8-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class8-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class8.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class8.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class8.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class8.ts
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class9-expected.txt b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class9-expected.txt
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class9-expected.txt
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class9-expected.txt
diff --git a/es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class9.ts b/es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class9.ts
similarity index 100%
rename from es2panda/test/compiler/ts/cases/compiler/test-ts-static-blocks-in-class9.ts
rename to es2panda/test/compiler/ts/cases/compiler/static-blocks-in-class/test-ts-static-blocks-in-class9.ts
diff --git a/es2panda/test/parser/js/test-comment-expected.txt b/es2panda/test/parser/js/test_cases/comment/test-comment-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-comment-expected.txt
rename to es2panda/test/parser/js/test_cases/comment/test-comment-expected.txt
diff --git a/es2panda/test/parser/js/test-comment.js b/es2panda/test/parser/js/test_cases/comment/test-comment.js
similarity index 100%
rename from es2panda/test/parser/js/test-comment.js
rename to es2panda/test/parser/js/test_cases/comment/test-comment.js
diff --git a/es2panda/test/parser/js/test-hashbang-comment-1-expected.txt b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-1-expected.txt
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-1-expected.txt
diff --git a/es2panda/test/parser/js/test-hashbang-comment-1.js b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-1.js
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-1.js
diff --git a/es2panda/test/parser/js/test-hashbang-comment-2-expected.txt b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-2-expected.txt
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-2-expected.txt
diff --git a/es2panda/test/parser/js/test-hashbang-comment-2.js b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-2.js
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-2.js
diff --git a/es2panda/test/parser/js/test-hashbang-comment-3-expected.txt b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-3-expected.txt
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-3-expected.txt
diff --git a/es2panda/test/parser/js/test-hashbang-comment-3.js b/es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-3.js
similarity index 100%
rename from es2panda/test/parser/js/test-hashbang-comment-3.js
rename to es2panda/test/parser/js/test_cases/comment/test-hashbang-comment-3.js
diff --git a/es2panda/test/parser/js/test-const-replacement-expected.txt b/es2panda/test/parser/js/test_cases/declarations/const/test-const-replacement-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-const-replacement-expected.txt
rename to es2panda/test/parser/js/test_cases/declarations/const/test-const-replacement-expected.txt
diff --git a/es2panda/test/parser/js/test-const-replacement.js b/es2panda/test/parser/js/test_cases/declarations/const/test-const-replacement.js
similarity index 95%
rename from es2panda/test/parser/js/test-const-replacement.js
rename to es2panda/test/parser/js/test_cases/declarations/const/test-const-replacement.js
index ba0dff1677e942bdbfe22c22a473991205a57250..88a67d2e9ce1cd1569579d4df6e32d944a689764 100644
--- a/es2panda/test/parser/js/test-const-replacement.js
+++ b/es2panda/test/parser/js/test_cases/declarations/const/test-const-replacement.js
@@ -1,36 +1,36 @@
-/*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-const a = 1;
-let b = a;
-
-const c = 1;
-function A() {
-  b = c;
-}
-
-function B() {
-  const d = 1;
-  for (let e = 1; e < d; e++) {
-    e = e + a;
-  }
-}
-
-a = 2;
-
-if (a) {
-  a++;
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+const a = 1;
+let b = a;
+
+const c = 1;
+function A() {
+  b = c;
+}
+
+function B() {
+  const d = 1;
+  for (let e = 1; e < d; e++) {
+    e = e + a;
+  }
+}
+
+a = 2;
+
+if (a) {
+  a++;
 }
\ No newline at end of file
diff --git a/es2panda/test/parser/js/test-const-without-init-expected.txt b/es2panda/test/parser/js/test_cases/declarations/const/test-const-without-init-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-const-without-init-expected.txt
rename to es2panda/test/parser/js/test_cases/declarations/const/test-const-without-init-expected.txt
diff --git a/es2panda/test/parser/js/test-const-without-init.js b/es2panda/test/parser/js/test_cases/declarations/const/test-const-without-init.js
similarity index 100%
rename from es2panda/test/parser/js/test-const-without-init.js
rename to es2panda/test/parser/js/test_cases/declarations/const/test-const-without-init.js
diff --git a/es2panda/test/parser/js/class-declaration-is-expected.txt b/es2panda/test/parser/js/test_cases/declarations/is/class-declaration-is-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/class-declaration-is-expected.txt
rename to es2panda/test/parser/js/test_cases/declarations/is/class-declaration-is-expected.txt
diff --git a/es2panda/test/parser/js/class-declaration-is.js b/es2panda/test/parser/js/test_cases/declarations/is/class-declaration-is.js
similarity index 100%
rename from es2panda/test/parser/js/class-declaration-is.js
rename to es2panda/test/parser/js/test_cases/declarations/is/class-declaration-is.js
diff --git a/es2panda/test/parser/js/test-let-redeclaration-expected.txt b/es2panda/test/parser/js/test_cases/declarations/let/test-let-redeclaration-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-let-redeclaration-expected.txt
rename to es2panda/test/parser/js/test_cases/declarations/let/test-let-redeclaration-expected.txt
diff --git a/es2panda/test/parser/js/test-let-redeclaration.js b/es2panda/test/parser/js/test_cases/declarations/let/test-let-redeclaration.js
similarity index 100%
rename from es2panda/test/parser/js/test-let-redeclaration.js
rename to es2panda/test/parser/js/test_cases/declarations/let/test-let-redeclaration.js
diff --git a/es2panda/test/parser/js/test-var-decl-expected.txt b/es2panda/test/parser/js/test_cases/declarations/var/test-var-decl-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-var-decl-expected.txt
rename to es2panda/test/parser/js/test_cases/declarations/var/test-var-decl-expected.txt
diff --git a/es2panda/test/parser/js/test-var-decl.js b/es2panda/test/parser/js/test_cases/declarations/var/test-var-decl.js
similarity index 100%
rename from es2panda/test/parser/js/test-var-decl.js
rename to es2panda/test/parser/js/test_cases/declarations/var/test-var-decl.js
diff --git a/es2panda/test/parser/js/test-array-expression-1-expected.txt b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression-1-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-1-expected.txt
diff --git a/es2panda/test/parser/js/test-array-expression-1.js b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression-1.js
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-1.js
diff --git a/es2panda/test/parser/js/test-array-expression-2-expected.txt b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression-2-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-2-expected.txt
diff --git a/es2panda/test/parser/js/test-array-expression-2.js b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression-2.js
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-2.js
diff --git a/es2panda/test/parser/js/test-array-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-array-expression.js b/es2panda/test/parser/js/test_cases/expressions/array/test-array-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-array-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/array/test-array-expression.js
diff --git a/es2panda/test/parser/js/test-arrow-function-expected.txt b/es2panda/test/parser/js/test_cases/expressions/arrow-function/test-arrow-function-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-arrow-function-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/arrow-function/test-arrow-function-expected.txt
diff --git a/es2panda/test/parser/js/test-arrow-function.js b/es2panda/test/parser/js/test_cases/expressions/arrow-function/test-arrow-function.js
similarity index 100%
rename from es2panda/test/parser/js/test-arrow-function.js
rename to es2panda/test/parser/js/test_cases/expressions/arrow-function/test-arrow-function.js
diff --git a/es2panda/test/parser/js/test-assignment-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/assignment/test-assignment-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-assignment-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/assignment/test-assignment-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-assignment-expression.js b/es2panda/test/parser/js/test_cases/expressions/assignment/test-assignment-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-assignment-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/assignment/test-assignment-expression.js
diff --git a/es2panda/test/parser/js/test-binary-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/binary/test-binary-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-binary-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/binary/test-binary-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-binary-expression.js b/es2panda/test/parser/js/test_cases/expressions/binary/test-binary-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-binary-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/binary/test-binary-expression.js
diff --git a/es2panda/test/parser/js/test-call-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/call/test-call-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-call-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/call/test-call-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-call-expression.js b/es2panda/test/parser/js/test_cases/expressions/call/test-call-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-call-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/call/test-call-expression.js
diff --git a/es2panda/test/parser/js/test-conditional-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/conditional/test-conditional-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-conditional-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/conditional/test-conditional-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-conditional-expression.js b/es2panda/test/parser/js/test_cases/expressions/conditional/test-conditional-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-conditional-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/conditional/test-conditional-expression.js
diff --git a/es2panda/test/parser/js/test-logical-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/logical/test-logical-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-logical-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/logical/test-logical-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-logical-expression.js b/es2panda/test/parser/js/test_cases/expressions/logical/test-logical-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-logical-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/logical/test-logical-expression.js
diff --git a/es2panda/test/parser/js/test-member-expression-1-expected.txt b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-1-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-1-expected.txt
diff --git a/es2panda/test/parser/js/test-member-expression-1.js b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-1.js
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-1.js
diff --git a/es2panda/test/parser/js/test-member-expression-2-expected.txt b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-2-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-2-expected.txt
diff --git a/es2panda/test/parser/js/test-member-expression-2.js b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-2.js
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-2.js
diff --git a/es2panda/test/parser/js/test-member-expression-3-expected.txt b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-3-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-3-expected.txt
diff --git a/es2panda/test/parser/js/test-member-expression-3.js b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-3.js
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-3.js
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-3.js
diff --git a/es2panda/test/parser/js/test-member-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-member-expression.js b/es2panda/test/parser/js/test_cases/expressions/member/test-member-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-member-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/member/test-member-expression.js
diff --git a/es2panda/test/parser/js/new-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/new/new-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/new-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/new/new-expression-expected.txt
diff --git a/es2panda/test/parser/js/new-expression.js b/es2panda/test/parser/js/test_cases/expressions/new/new-expression.js
similarity index 100%
rename from es2panda/test/parser/js/new-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/new/new-expression.js
diff --git a/es2panda/test/parser/js/test-new-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/new/test-new-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-new-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/new/test-new-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-new-expression.js b/es2panda/test/parser/js/test_cases/expressions/new/test-new-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-new-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/new/test-new-expression.js
diff --git a/es2panda/test/parser/js/test-object-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression.js
diff --git a/es2panda/test/parser/js/test-object-expression1-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression1-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression1-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression1.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression1.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression1.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression1.js
diff --git a/es2panda/test/parser/js/test-object-expression2-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression2-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression2-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression2.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression2.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression2.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression2.js
diff --git a/es2panda/test/parser/js/test-object-expression3-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression3-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression3-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression3.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression3.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression3.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression3.js
diff --git a/es2panda/test/parser/js/test-object-expression4-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression4-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression4-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression4.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression4.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression4.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression4.js
diff --git a/es2panda/test/parser/js/test-object-expression5-expected.txt b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression5-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression5-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression5-expected.txt
diff --git a/es2panda/test/parser/js/test-object-expression5.js b/es2panda/test/parser/js/test_cases/expressions/object/test-object-expression5.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-expression5.js
rename to es2panda/test/parser/js/test_cases/expressions/object/test-object-expression5.js
diff --git a/es2panda/test/parser/js/test-sequence-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/sequence/test-sequence-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-sequence-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/sequence/test-sequence-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-sequence-expression.js b/es2panda/test/parser/js/test_cases/expressions/sequence/test-sequence-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-sequence-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/sequence/test-sequence-expression.js
diff --git a/es2panda/test/parser/js/test-super-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/super/test-super-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-super-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/super/test-super-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-super-expression.js b/es2panda/test/parser/js/test_cases/expressions/super/test-super-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-super-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/super/test-super-expression.js
diff --git a/es2panda/test/parser/js/test-tagged-template-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/template/test-tagged-template-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-tagged-template-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/template/test-tagged-template-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-tagged-template-expression.js b/es2panda/test/parser/js/test_cases/expressions/template/test-tagged-template-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-tagged-template-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/template/test-tagged-template-expression.js
diff --git a/es2panda/test/parser/js/test-template-literal-1-expected.txt b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal-1-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-1-expected.txt
diff --git a/es2panda/test/parser/js/test-template-literal-1.js b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal-1.js
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-1.js
diff --git a/es2panda/test/parser/js/test-template-literal-2-expected.txt b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal-2-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-2-expected.txt
diff --git a/es2panda/test/parser/js/test-template-literal-2.js b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal-2.js
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-2.js
diff --git a/es2panda/test/parser/js/test-template-literal-expected.txt b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal-expected.txt
diff --git a/es2panda/test/parser/js/test-template-literal.js b/es2panda/test/parser/js/test_cases/expressions/template/test-template-literal.js
similarity index 100%
rename from es2panda/test/parser/js/test-template-literal.js
rename to es2panda/test/parser/js/test_cases/expressions/template/test-template-literal.js
diff --git a/es2panda/test/parser/js/test-this-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/this/test-this-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-this-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/this/test-this-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-this-expression.js b/es2panda/test/parser/js/test_cases/expressions/this/test-this-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-this-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/this/test-this-expression.js
diff --git a/es2panda/test/parser/js/this-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/this/this-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/this-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/this/this-expression-expected.txt
diff --git a/es2panda/test/parser/js/this-expression.js b/es2panda/test/parser/js/test_cases/expressions/this/this-expression.js
similarity index 100%
rename from es2panda/test/parser/js/this-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/this/this-expression.js
diff --git a/es2panda/test/parser/js/test-expression-after-unary-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/unary/test-expression-after-unary-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-expression-after-unary-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/unary/test-expression-after-unary-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-expression-after-unary-expression.js b/es2panda/test/parser/js/test_cases/expressions/unary/test-expression-after-unary-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-expression-after-unary-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/unary/test-expression-after-unary-expression.js
diff --git a/es2panda/test/parser/js/test-unary-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/unary/test-unary-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-unary-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/unary/test-unary-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-unary-expression.js b/es2panda/test/parser/js/test_cases/expressions/unary/test-unary-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-unary-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/unary/test-unary-expression.js
diff --git a/es2panda/test/parser/js/test-multiple-update-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/update/test-multiple-update-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-multiple-update-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/update/test-multiple-update-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-multiple-update-expression.js b/es2panda/test/parser/js/test_cases/expressions/update/test-multiple-update-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-multiple-update-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/update/test-multiple-update-expression.js
diff --git a/es2panda/test/parser/js/test-update-expression-expected.txt b/es2panda/test/parser/js/test_cases/expressions/update/test-update-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-update-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/expressions/update/test-update-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-update-expression.js b/es2panda/test/parser/js/test_cases/expressions/update/test-update-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-update-expression.js
rename to es2panda/test/parser/js/test_cases/expressions/update/test-update-expression.js
diff --git a/es2panda/test/parser/js/function-declaration-arguments-expected.txt b/es2panda/test/parser/js/test_cases/function/function-declaration-arguments-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/function-declaration-arguments-expected.txt
rename to es2panda/test/parser/js/test_cases/function/function-declaration-arguments-expected.txt
diff --git a/es2panda/test/parser/js/function-declaration-arguments.js b/es2panda/test/parser/js/test_cases/function/function-declaration-arguments.js
similarity index 100%
rename from es2panda/test/parser/js/function-declaration-arguments.js
rename to es2panda/test/parser/js/test_cases/function/function-declaration-arguments.js
diff --git a/es2panda/test/parser/js/function-declaration-is-expected.txt b/es2panda/test/parser/js/test_cases/function/function-declaration-is-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/function-declaration-is-expected.txt
rename to es2panda/test/parser/js/test_cases/function/function-declaration-is-expected.txt
diff --git a/es2panda/test/parser/js/function-declaration-is.js b/es2panda/test/parser/js/test_cases/function/function-declaration-is.js
similarity index 100%
rename from es2panda/test/parser/js/function-declaration-is.js
rename to es2panda/test/parser/js/test_cases/function/function-declaration-is.js
diff --git a/es2panda/test/parser/js/function-expression-arguments-expected.txt b/es2panda/test/parser/js/test_cases/function/function-expression-arguments-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/function-expression-arguments-expected.txt
rename to es2panda/test/parser/js/test_cases/function/function-expression-arguments-expected.txt
diff --git a/es2panda/test/parser/js/function-expression-arguments.js b/es2panda/test/parser/js/test_cases/function/function-expression-arguments.js
similarity index 100%
rename from es2panda/test/parser/js/function-expression-arguments.js
rename to es2panda/test/parser/js/test_cases/function/function-expression-arguments.js
diff --git a/es2panda/test/parser/js/function-expression-is-expected.txt b/es2panda/test/parser/js/test_cases/function/function-expression-is-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/function-expression-is-expected.txt
rename to es2panda/test/parser/js/test_cases/function/function-expression-is-expected.txt
diff --git a/es2panda/test/parser/js/function-expression-is.js b/es2panda/test/parser/js/test_cases/function/function-expression-is.js
similarity index 100%
rename from es2panda/test/parser/js/function-expression-is.js
rename to es2panda/test/parser/js/test_cases/function/function-expression-is.js
diff --git a/es2panda/test/parser/js/test-async-arrow-function-1-expected.txt b/es2panda/test/parser/js/test_cases/function/test-async-arrow-function-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-async-arrow-function-1-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-async-arrow-function-1-expected.txt
diff --git a/es2panda/test/parser/js/test-async-arrow-function-1.js b/es2panda/test/parser/js/test_cases/function/test-async-arrow-function-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-async-arrow-function-1.js
rename to es2panda/test/parser/js/test_cases/function/test-async-arrow-function-1.js
diff --git a/es2panda/test/parser/js/test-async-function-1-expected.txt b/es2panda/test/parser/js/test_cases/function/test-async-function-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-async-function-1-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-async-function-1-expected.txt
diff --git a/es2panda/test/parser/js/test-async-function-1.js b/es2panda/test/parser/js/test_cases/function/test-async-function-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-async-function-1.js
rename to es2panda/test/parser/js/test_cases/function/test-async-function-1.js
diff --git a/es2panda/test/parser/js/test-async-function-2-expected.txt b/es2panda/test/parser/js/test_cases/function/test-async-function-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-async-function-2-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-async-function-2-expected.txt
diff --git a/es2panda/test/parser/js/test-async-function-2.js b/es2panda/test/parser/js/test_cases/function/test-async-function-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-async-function-2.js
rename to es2panda/test/parser/js/test_cases/function/test-async-function-2.js
diff --git a/es2panda/test/parser/js/test-function-decl-expected.txt b/es2panda/test/parser/js/test_cases/function/test-function-decl-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-function-decl-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-function-decl-expected.txt
diff --git a/es2panda/test/parser/js/test-function-decl.js b/es2panda/test/parser/js/test_cases/function/test-function-decl.js
similarity index 100%
rename from es2panda/test/parser/js/test-function-decl.js
rename to es2panda/test/parser/js/test_cases/function/test-function-decl.js
diff --git a/es2panda/test/parser/js/test-function-scope-violation-1-expected.txt b/es2panda/test/parser/js/test_cases/function/test-function-scope-violation-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-function-scope-violation-1-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-function-scope-violation-1-expected.txt
diff --git a/es2panda/test/parser/js/test-function-scope-violation-1.js b/es2panda/test/parser/js/test_cases/function/test-function-scope-violation-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-function-scope-violation-1.js
rename to es2panda/test/parser/js/test_cases/function/test-function-scope-violation-1.js
diff --git a/es2panda/test/parser/js/test-function-scope-violation-2-expected.txt b/es2panda/test/parser/js/test_cases/function/test-function-scope-violation-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-function-scope-violation-2-expected.txt
rename to es2panda/test/parser/js/test_cases/function/test-function-scope-violation-2-expected.txt
diff --git a/es2panda/test/parser/js/test-function-scope-violation-2.js b/es2panda/test/parser/js/test_cases/function/test-function-scope-violation-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-function-scope-violation-2.js
rename to es2panda/test/parser/js/test_cases/function/test-function-scope-violation-2.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-1-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-1-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-1-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-1.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-1.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-1.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-1.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-2-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-2-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-2-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-2.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-2.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-2.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-2.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-3-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-3-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-3-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-3.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-3.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-3.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-3.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-4-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-4-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-4-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-4.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-4.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-4.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-4.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-5-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-5-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-5-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-5-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-5.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-5.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-5.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-5.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-6-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-6-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-6-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-6-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-6.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-6.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-6.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-6.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-7-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-7-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-7-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-7-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-7.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-7.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-7.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-7.js
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-8-expected.txt b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-8-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-8-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-8-expected.txt
diff --git a/es2panda/test/parser/js/Invalid-destructuring-target-arguments-8.js b/es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-8.js
similarity index 100%
rename from es2panda/test/parser/js/Invalid-destructuring-target-arguments-8.js
rename to es2panda/test/parser/js/test_cases/invalid/Invalid-destructuring-target-arguments-8.js
diff --git a/es2panda/test/parser/js/invalid-left-hand-side-in-prefix-operation-expected.txt b/es2panda/test/parser/js/test_cases/invalid/invalid-left-hand-side-in-prefix-operation-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/invalid-left-hand-side-in-prefix-operation-expected.txt
rename to es2panda/test/parser/js/test_cases/invalid/invalid-left-hand-side-in-prefix-operation-expected.txt
diff --git a/es2panda/test/parser/js/invalid-left-hand-side-in-prefix-operation.js b/es2panda/test/parser/js/test_cases/invalid/invalid-left-hand-side-in-prefix-operation.js
similarity index 100%
rename from es2panda/test/parser/js/invalid-left-hand-side-in-prefix-operation.js
rename to es2panda/test/parser/js/test_cases/invalid/invalid-left-hand-side-in-prefix-operation.js
diff --git a/es2panda/test/parser/js/test-export-all-expected.txt b/es2panda/test/parser/js/test_cases/modules/export/test-export-all-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-export-all-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/export/test-export-all-expected.txt
diff --git a/es2panda/test/parser/js/test-export-all.js b/es2panda/test/parser/js/test_cases/modules/export/test-export-all.js
similarity index 100%
rename from es2panda/test/parser/js/test-export-all.js
rename to es2panda/test/parser/js/test_cases/modules/export/test-export-all.js
diff --git a/es2panda/test/parser/js/test-export-named-decl-expected.txt b/es2panda/test/parser/js/test_cases/modules/export/test-export-named-decl-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-export-named-decl-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/export/test-export-named-decl-expected.txt
diff --git a/es2panda/test/parser/js/test-export-named-decl.js b/es2panda/test/parser/js/test_cases/modules/export/test-export-named-decl.js
similarity index 100%
rename from es2panda/test/parser/js/test-export-named-decl.js
rename to es2panda/test/parser/js/test_cases/modules/export/test-export-named-decl.js
diff --git a/es2panda/test/parser/js/test-one-default-export-allowed-expected.txt b/es2panda/test/parser/js/test_cases/modules/export/test-one-default-export-allowed-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-one-default-export-allowed-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/export/test-one-default-export-allowed-expected.txt
diff --git a/es2panda/test/parser/js/test-one-default-export-allowed.js b/es2panda/test/parser/js/test_cases/modules/export/test-one-default-export-allowed.js
similarity index 100%
rename from es2panda/test/parser/js/test-one-default-export-allowed.js
rename to es2panda/test/parser/js/test_cases/modules/export/test-one-default-export-allowed.js
diff --git a/es2panda/test/parser/js/test-import-decl-expected.txt b/es2panda/test/parser/js/test_cases/modules/import/test-import-decl-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-import-decl-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-decl-expected.txt
diff --git a/es2panda/test/parser/js/test-import-decl.js b/es2panda/test/parser/js/test_cases/modules/import/test-import-decl.js
similarity index 100%
rename from es2panda/test/parser/js/test-import-decl.js
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-decl.js
diff --git a/es2panda/test/parser/js/test-import-expression-expected.txt b/es2panda/test/parser/js/test_cases/modules/import/test-import-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-import-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-import-expression.js b/es2panda/test/parser/js/test_cases/modules/import/test-import-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-import-expression.js
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-expression.js
diff --git a/es2panda/test/parser/js/test-import-meta-expected.txt b/es2panda/test/parser/js/test_cases/modules/import/test-import-meta-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-import-meta-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-meta-expected.txt
diff --git a/es2panda/test/parser/js/test-import-meta.js b/es2panda/test/parser/js/test_cases/modules/import/test-import-meta.js
similarity index 100%
rename from es2panda/test/parser/js/test-import-meta.js
rename to es2panda/test/parser/js/test_cases/modules/import/test-import-meta.js
diff --git a/es2panda/test/parser/js/test-imported-decl1-expected.txt b/es2panda/test/parser/js/test_cases/modules/import/test-imported-decl1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-imported-decl1-expected.txt
rename to es2panda/test/parser/js/test_cases/modules/import/test-imported-decl1-expected.txt
diff --git a/es2panda/test/parser/js/test-imported-decl1.js b/es2panda/test/parser/js/test_cases/modules/import/test-imported-decl1.js
similarity index 100%
rename from es2panda/test/parser/js/test-imported-decl1.js
rename to es2panda/test/parser/js/test_cases/modules/import/test-imported-decl1.js
diff --git a/es2panda/test/parser/js/test-nullish-coalescing-expected.txt b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing-expected.txt
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing-expected.txt
diff --git a/es2panda/test/parser/js/test-nullish-coalescing.js b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing.js
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing.js
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing.js
diff --git a/es2panda/test/parser/js/test-nullish-coalescing1-expected.txt b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing1-expected.txt
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing1-expected.txt
diff --git a/es2panda/test/parser/js/test-nullish-coalescing1.js b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing1.js
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing1.js
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing1.js
diff --git a/es2panda/test/parser/js/test-nullish-coalescing2-expected.txt b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing2-expected.txt
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing2-expected.txt
diff --git a/es2panda/test/parser/js/test-nullish-coalescing2.js b/es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing2.js
similarity index 100%
rename from es2panda/test/parser/js/test-nullish-coalescing2.js
rename to es2panda/test/parser/js/test_cases/nullish-coalescing/test-nullish-coalescing2.js
diff --git a/es2panda/test/parser/js/test-numeric-separator-expected.txt b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator-expected.txt
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator-expected.txt
diff --git a/es2panda/test/parser/js/test-numeric-separator.js b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator.js
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator.js
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator.js
diff --git a/es2panda/test/parser/js/test-numeric-separator1-expected.txt b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator1-expected.txt
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator1-expected.txt
diff --git a/es2panda/test/parser/js/test-numeric-separator1.js b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator1.js
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator1.js
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator1.js
diff --git a/es2panda/test/parser/js/test-numeric-separator2-expected.txt b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator2-expected.txt
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator2-expected.txt
diff --git a/es2panda/test/parser/js/test-numeric-separator2.js b/es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator2.js
similarity index 100%
rename from es2panda/test/parser/js/test-numeric-separator2.js
rename to es2panda/test/parser/js/test_cases/numeric-separator/test-numeric-separator2.js
diff --git a/es2panda/test/parser/js/test-delete-identifier-expected.txt b/es2panda/test/parser/js/test_cases/others/test-delete-identifier-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-delete-identifier-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-delete-identifier-expected.txt
diff --git a/es2panda/test/parser/js/test-delete-identifier.js b/es2panda/test/parser/js/test_cases/others/test-delete-identifier.js
similarity index 100%
rename from es2panda/test/parser/js/test-delete-identifier.js
rename to es2panda/test/parser/js/test_cases/others/test-delete-identifier.js
diff --git a/es2panda/test/parser/js/test-escaped-keyword-expected.txt b/es2panda/test/parser/js/test_cases/others/test-escaped-keyword-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-escaped-keyword-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-escaped-keyword-expected.txt
diff --git a/es2panda/test/parser/js/test-escaped-keyword.js b/es2panda/test/parser/js/test_cases/others/test-escaped-keyword.js
similarity index 100%
rename from es2panda/test/parser/js/test-escaped-keyword.js
rename to es2panda/test/parser/js/test_cases/others/test-escaped-keyword.js
diff --git a/es2panda/test/parser/js/test-grouping-level-expected.txt b/es2panda/test/parser/js/test_cases/others/test-grouping-level-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-grouping-level-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-grouping-level-expected.txt
diff --git a/es2panda/test/parser/js/test-grouping-level.js b/es2panda/test/parser/js/test_cases/others/test-grouping-level.js
similarity index 100%
rename from es2panda/test/parser/js/test-grouping-level.js
rename to es2panda/test/parser/js/test_cases/others/test-grouping-level.js
diff --git a/es2panda/test/parser/js/test-incomplete-hex-unicode-escape-expected.txt b/es2panda/test/parser/js/test_cases/others/test-incomplete-hex-unicode-escape-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-incomplete-hex-unicode-escape-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-incomplete-hex-unicode-escape-expected.txt
diff --git a/es2panda/test/parser/js/test-incomplete-hex-unicode-escape.js b/es2panda/test/parser/js/test_cases/others/test-incomplete-hex-unicode-escape.js
similarity index 100%
rename from es2panda/test/parser/js/test-incomplete-hex-unicode-escape.js
rename to es2panda/test/parser/js/test_cases/others/test-incomplete-hex-unicode-escape.js
diff --git a/es2panda/test/parser/js/test-invalid-unicode-escape-expected.txt b/es2panda/test/parser/js/test_cases/others/test-invalid-unicode-escape-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-invalid-unicode-escape-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-invalid-unicode-escape-expected.txt
diff --git a/es2panda/test/parser/js/test-invalid-unicode-escape.js b/es2panda/test/parser/js/test_cases/others/test-invalid-unicode-escape.js
similarity index 100%
rename from es2panda/test/parser/js/test-invalid-unicode-escape.js
rename to es2panda/test/parser/js/test_cases/others/test-invalid-unicode-escape.js
diff --git a/es2panda/test/parser/js/test-labeled-iteration-continue-target-expected.txt b/es2panda/test/parser/js/test_cases/others/test-labeled-iteration-continue-target-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-labeled-iteration-continue-target-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-labeled-iteration-continue-target-expected.txt
diff --git a/es2panda/test/parser/js/test-labeled-iteration-continue-target.js b/es2panda/test/parser/js/test_cases/others/test-labeled-iteration-continue-target.js
similarity index 100%
rename from es2panda/test/parser/js/test-labeled-iteration-continue-target.js
rename to es2panda/test/parser/js/test_cases/others/test-labeled-iteration-continue-target.js
diff --git a/es2panda/test/parser/js/test-object-proto-expected.txt b/es2panda/test/parser/js/test_cases/others/test-object-proto-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-object-proto-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-object-proto-expected.txt
diff --git a/es2panda/test/parser/js/test-object-proto.js b/es2panda/test/parser/js/test_cases/others/test-object-proto.js
similarity index 100%
rename from es2panda/test/parser/js/test-object-proto.js
rename to es2panda/test/parser/js/test_cases/others/test-object-proto.js
diff --git a/es2panda/test/parser/js/test-optional-chain-expected.txt b/es2panda/test/parser/js/test_cases/others/test-optional-chain-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-optional-chain-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-optional-chain-expected.txt
diff --git a/es2panda/test/parser/js/test-optional-chain.js b/es2panda/test/parser/js/test_cases/others/test-optional-chain.js
similarity index 100%
rename from es2panda/test/parser/js/test-optional-chain.js
rename to es2panda/test/parser/js/test_cases/others/test-optional-chain.js
diff --git a/es2panda/test/parser/js/test-patterns-expected.txt b/es2panda/test/parser/js/test_cases/others/test-patterns-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-patterns-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-patterns-expected.txt
diff --git a/es2panda/test/parser/js/test-patterns.js b/es2panda/test/parser/js/test_cases/others/test-patterns.js
similarity index 100%
rename from es2panda/test/parser/js/test-patterns.js
rename to es2panda/test/parser/js/test_cases/others/test-patterns.js
diff --git a/es2panda/test/parser/js/test-use-strict-1-expected.txt b/es2panda/test/parser/js/test_cases/others/test-use-strict-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-use-strict-1-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-use-strict-1-expected.txt
diff --git a/es2panda/test/parser/js/test-use-strict-1.js b/es2panda/test/parser/js/test_cases/others/test-use-strict-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-use-strict-1.js
rename to es2panda/test/parser/js/test_cases/others/test-use-strict-1.js
diff --git a/es2panda/test/parser/js/test-use-strict-2-expected.txt b/es2panda/test/parser/js/test_cases/others/test-use-strict-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-use-strict-2-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-use-strict-2-expected.txt
diff --git a/es2panda/test/parser/js/test-use-strict-2.js b/es2panda/test/parser/js/test_cases/others/test-use-strict-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-use-strict-2.js
rename to es2panda/test/parser/js/test_cases/others/test-use-strict-2.js
diff --git a/es2panda/test/parser/js/test-without-ending-lf-expected.txt b/es2panda/test/parser/js/test_cases/others/test-without-ending-lf-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-without-ending-lf-expected.txt
rename to es2panda/test/parser/js/test_cases/others/test-without-ending-lf-expected.txt
diff --git a/es2panda/test/parser/js/test-without-ending-lf.js b/es2panda/test/parser/js/test_cases/others/test-without-ending-lf.js
similarity index 100%
rename from es2panda/test/parser/js/test-without-ending-lf.js
rename to es2panda/test/parser/js/test_cases/others/test-without-ending-lf.js
diff --git a/es2panda/test/parser/js/test-invalid-regexp-flags-expected.txt b/es2panda/test/parser/js/test_cases/regex/test-invalid-regexp-flags-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-invalid-regexp-flags-expected.txt
rename to es2panda/test/parser/js/test_cases/regex/test-invalid-regexp-flags-expected.txt
diff --git a/es2panda/test/parser/js/test-invalid-regexp-flags.js b/es2panda/test/parser/js/test_cases/regex/test-invalid-regexp-flags.js
similarity index 100%
rename from es2panda/test/parser/js/test-invalid-regexp-flags.js
rename to es2panda/test/parser/js/test_cases/regex/test-invalid-regexp-flags.js
diff --git a/es2panda/test/parser/js/test-regexp-p-expected.txt b/es2panda/test/parser/js/test_cases/regex/test-regexp-p-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-regexp-p-expected.txt
rename to es2panda/test/parser/js/test_cases/regex/test-regexp-p-expected.txt
diff --git a/es2panda/test/parser/js/test-regexp-p.js b/es2panda/test/parser/js/test_cases/regex/test-regexp-p.js
similarity index 100%
rename from es2panda/test/parser/js/test-regexp-p.js
rename to es2panda/test/parser/js/test_cases/regex/test-regexp-p.js
diff --git a/es2panda/test/parser/js/test-class-async-method-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-async-method-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-async-method-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-async-method-expected.txt
diff --git a/es2panda/test/parser/js/test-class-async-method.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-async-method.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-async-method.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-async-method.js
diff --git a/es2panda/test/parser/js/test-class-constructor-1-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-constructor-1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-1-expected.txt
diff --git a/es2panda/test/parser/js/test-class-constructor-1.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-constructor-1.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-1.js
diff --git a/es2panda/test/parser/js/test-class-constructor-2-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-constructor-2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-2-expected.txt
diff --git a/es2panda/test/parser/js/test-class-constructor-2.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-constructor-2.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-constructor-2.js
diff --git a/es2panda/test/parser/js/test-class-definition-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition.js
diff --git a/es2panda/test/parser/js/test-class-definition1-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition1-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition1.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition1.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition1.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition1.js
diff --git a/es2panda/test/parser/js/test-class-definition2-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition2-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition2.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition2.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition2.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition2.js
diff --git a/es2panda/test/parser/js/test-class-definition3-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition3-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition3-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition3.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition3.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition3.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition3.js
diff --git a/es2panda/test/parser/js/test-class-definition4-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition4-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition4-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition4.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition4.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition4.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition4.js
diff --git a/es2panda/test/parser/js/test-class-definition5-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition5-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition5-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition5-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition5.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition5.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition5.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition5.js
diff --git a/es2panda/test/parser/js/test-class-definition6-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition6-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition6-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition6-expected.txt
diff --git a/es2panda/test/parser/js/test-class-definition6.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-definition6.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-definition6.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-definition6.js
diff --git a/es2panda/test/parser/js/test-class-expression-expected.txt b/es2panda/test/parser/js/test_cases/statements/class/test-class-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-class-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-class-expression.js b/es2panda/test/parser/js/test_cases/statements/class/test-class-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-class-expression.js
rename to es2panda/test/parser/js/test_cases/statements/class/test-class-expression.js
diff --git a/es2panda/test/parser/js/test-debugger-statement-expected.txt b/es2panda/test/parser/js/test_cases/statements/debugger/test-debugger-statement-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-debugger-statement-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/debugger/test-debugger-statement-expected.txt
diff --git a/es2panda/test/parser/js/test-debugger-statement.js b/es2panda/test/parser/js/test_cases/statements/debugger/test-debugger-statement.js
similarity index 100%
rename from es2panda/test/parser/js/test-debugger-statement.js
rename to es2panda/test/parser/js/test_cases/statements/debugger/test-debugger-statement.js
diff --git a/es2panda/test/parser/js/test-if-1-expected.txt b/es2panda/test/parser/js/test_cases/statements/if/test-if-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-if-1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/if/test-if-1-expected.txt
diff --git a/es2panda/test/parser/js/test-if-1.js b/es2panda/test/parser/js/test_cases/statements/if/test-if-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-if-1.js
rename to es2panda/test/parser/js/test_cases/statements/if/test-if-1.js
diff --git a/es2panda/test/parser/js/test-if-2-expected.txt b/es2panda/test/parser/js/test_cases/statements/if/test-if-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-if-2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/if/test-if-2-expected.txt
diff --git a/es2panda/test/parser/js/test-if-2.js b/es2panda/test/parser/js/test_cases/statements/if/test-if-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-if-2.js
rename to es2panda/test/parser/js/test_cases/statements/if/test-if-2.js
diff --git a/es2panda/test/parser/js/test-if-expected.txt b/es2panda/test/parser/js/test_cases/statements/if/test-if-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-if-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/if/test-if-expected.txt
diff --git a/es2panda/test/parser/js/test-if.js b/es2panda/test/parser/js/test_cases/statements/if/test-if.js
similarity index 100%
rename from es2panda/test/parser/js/test-if.js
rename to es2panda/test/parser/js/test_cases/statements/if/test-if.js
diff --git a/es2panda/test/parser/js/test-do-while-1-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-do-while-1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-1-expected.txt
diff --git a/es2panda/test/parser/js/test-do-while-1.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-do-while-1.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-1.js
diff --git a/es2panda/test/parser/js/test-do-while-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-do-while-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-do-while-expected.txt
diff --git a/es2panda/test/parser/js/test-do-while.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-do-while.js
similarity index 100%
rename from es2panda/test/parser/js/test-do-while.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-do-while.js
diff --git a/es2panda/test/parser/js/test-for-1-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-for-1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-1-expected.txt
diff --git a/es2panda/test/parser/js/test-for-1.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-for-1.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-1.js
diff --git a/es2panda/test/parser/js/test-for-2-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-for-2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-2-expected.txt
diff --git a/es2panda/test/parser/js/test-for-2.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-for-2.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-2.js
diff --git a/es2panda/test/parser/js/test-for-3-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-for-3-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-3-expected.txt
diff --git a/es2panda/test/parser/js/test-for-3.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-3.js
similarity index 100%
rename from es2panda/test/parser/js/test-for-3.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-3.js
diff --git a/es2panda/test/parser/js/test-for-4-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-for-4-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-4-expected.txt
diff --git a/es2panda/test/parser/js/test-for-4.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-4.js
similarity index 100%
rename from es2panda/test/parser/js/test-for-4.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-4.js
diff --git a/es2panda/test/parser/js/test-for-expected.txt b/es2panda/test/parser/js/test_cases/statements/iteration/test-for-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-for-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for-expected.txt
diff --git a/es2panda/test/parser/js/test-for.js b/es2panda/test/parser/js/test_cases/statements/iteration/test-for.js
similarity index 100%
rename from es2panda/test/parser/js/test-for.js
rename to es2panda/test/parser/js/test_cases/statements/iteration/test-for.js
diff --git a/es2panda/test/parser/js/test-labelled-statement-expected.txt b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement-expected.txt
diff --git a/es2panda/test/parser/js/test-labelled-statement.js b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement.js
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement.js
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement.js
diff --git a/es2panda/test/parser/js/test-labelled-statement1-expected.txt b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement1-expected.txt
diff --git a/es2panda/test/parser/js/test-labelled-statement1.js b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement1.js
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement1.js
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement1.js
diff --git a/es2panda/test/parser/js/test-labelled-statement2-expected.txt b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement2-expected.txt
diff --git a/es2panda/test/parser/js/test-labelled-statement2.js b/es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement2.js
similarity index 100%
rename from es2panda/test/parser/js/test-labelled-statement2.js
rename to es2panda/test/parser/js/test_cases/statements/labelled/test-labelled-statement2.js
diff --git a/es2panda/test/parser/js/test-continue-in-switch-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-continue-in-switch-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-continue-in-switch-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-continue-in-switch-expected.txt
diff --git a/es2panda/test/parser/js/test-continue-in-switch.js b/es2panda/test/parser/js/test_cases/statements/switch/test-continue-in-switch.js
similarity index 100%
rename from es2panda/test/parser/js/test-continue-in-switch.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-continue-in-switch.js
diff --git a/es2panda/test/parser/js/test-switch-1-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-1-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-1-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-1.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-1.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-1.js
diff --git a/es2panda/test/parser/js/test-switch-2-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-2-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-2-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-2.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-2.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-2.js
diff --git a/es2panda/test/parser/js/test-switch-3-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-3-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-3-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-3.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-3.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-3.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-3.js
diff --git a/es2panda/test/parser/js/test-switch-4-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-4-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-4-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-4.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-4.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-4.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-4.js
diff --git a/es2panda/test/parser/js/test-switch-5-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-5-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-5-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-5-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-5.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-5.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-5.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-5.js
diff --git a/es2panda/test/parser/js/test-switch-6-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-6-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-6-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-6-expected.txt
diff --git a/es2panda/test/parser/js/test-switch-6.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-6.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch-6.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-6.js
diff --git a/es2panda/test/parser/js/test-switch-expected.txt b/es2panda/test/parser/js/test_cases/statements/switch/test-switch-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-switch-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch-expected.txt
diff --git a/es2panda/test/parser/js/test-switch.js b/es2panda/test/parser/js/test_cases/statements/switch/test-switch.js
similarity index 100%
rename from es2panda/test/parser/js/test-switch.js
rename to es2panda/test/parser/js/test_cases/statements/switch/test-switch.js
diff --git a/es2panda/test/parser/js/test-throw-statement-expected.txt b/es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-throw-statement-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-expected.txt
diff --git a/es2panda/test/parser/js/test-throw-statement-without-expression-expected.txt b/es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-without-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-throw-statement-without-expression-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-without-expression-expected.txt
diff --git a/es2panda/test/parser/js/test-throw-statement-without-expression.js b/es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-without-expression.js
similarity index 100%
rename from es2panda/test/parser/js/test-throw-statement-without-expression.js
rename to es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement-without-expression.js
diff --git a/es2panda/test/parser/js/test-throw-statement.js b/es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement.js
similarity index 100%
rename from es2panda/test/parser/js/test-throw-statement.js
rename to es2panda/test/parser/js/test_cases/statements/throw/test-throw-statement.js
diff --git a/es2panda/test/parser/js/test-missing-catch-argument-expected.txt b/es2panda/test/parser/js/test_cases/statements/try-catch/test-missing-catch-argument-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-missing-catch-argument-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-missing-catch-argument-expected.txt
diff --git a/es2panda/test/parser/js/test-missing-catch-argument.js b/es2panda/test/parser/js/test_cases/statements/try-catch/test-missing-catch-argument.js
similarity index 100%
rename from es2panda/test/parser/js/test-missing-catch-argument.js
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-missing-catch-argument.js
diff --git a/es2panda/test/parser/js/test-try-catch-lexical-declaration-expected.txt b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-catch-lexical-declaration-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-try-catch-lexical-declaration-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-catch-lexical-declaration-expected.txt
diff --git a/es2panda/test/parser/js/test-try-catch-lexical-declaration.js b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-catch-lexical-declaration.js
similarity index 100%
rename from es2panda/test/parser/js/test-try-catch-lexical-declaration.js
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-catch-lexical-declaration.js
diff --git a/es2panda/test/parser/js/test-try-statement-expected.txt b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-statement-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-try-statement-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-statement-expected.txt
diff --git a/es2panda/test/parser/js/test-try-statement.js b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-statement.js
similarity index 100%
rename from es2panda/test/parser/js/test-try-statement.js
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-statement.js
diff --git a/es2panda/test/parser/js/test-try-without-catch-and-finally-expected.txt b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-without-catch-and-finally-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-try-without-catch-and-finally-expected.txt
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-without-catch-and-finally-expected.txt
diff --git a/es2panda/test/parser/js/test-try-without-catch-and-finally.js b/es2panda/test/parser/js/test_cases/statements/try-catch/test-try-without-catch-and-finally.js
similarity index 100%
rename from es2panda/test/parser/js/test-try-without-catch-and-finally.js
rename to es2panda/test/parser/js/test_cases/statements/try-catch/test-try-without-catch-and-finally.js
diff --git a/es2panda/test/parser/js/test-multi-line-string-expected.txt b/es2panda/test/parser/js/test_cases/string/test-multi-line-string-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-multi-line-string-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test-multi-line-string-expected.txt
diff --git a/es2panda/test/parser/js/test-multi-line-string.js b/es2panda/test/parser/js/test_cases/string/test-multi-line-string.js
similarity index 100%
rename from es2panda/test/parser/js/test-multi-line-string.js
rename to es2panda/test/parser/js/test_cases/string/test-multi-line-string.js
diff --git a/es2panda/test/parser/js/test-octal-escape-in-template-string-expected.txt b/es2panda/test/parser/js/test_cases/string/test-octal-escape-in-template-string-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-octal-escape-in-template-string-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test-octal-escape-in-template-string-expected.txt
diff --git a/es2panda/test/parser/js/test-octal-escape-in-template-string.js b/es2panda/test/parser/js/test_cases/string/test-octal-escape-in-template-string.js
similarity index 100%
rename from es2panda/test/parser/js/test-octal-escape-in-template-string.js
rename to es2panda/test/parser/js/test_cases/string/test-octal-escape-in-template-string.js
diff --git a/es2panda/test/parser/js/test-special-character-processing-in-template-string-expected.txt b/es2panda/test/parser/js/test_cases/string/test-special-character-processing-in-template-string-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-special-character-processing-in-template-string-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test-special-character-processing-in-template-string-expected.txt
diff --git a/es2panda/test/parser/js/test-special-character-processing-in-template-string.js b/es2panda/test/parser/js/test_cases/string/test-special-character-processing-in-template-string.js
similarity index 100%
rename from es2panda/test/parser/js/test-special-character-processing-in-template-string.js
rename to es2panda/test/parser/js/test_cases/string/test-special-character-processing-in-template-string.js
diff --git a/es2panda/test/parser/js/test-string-literal-expected.txt b/es2panda/test/parser/js/test_cases/string/test-string-literal-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-string-literal-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test-string-literal-expected.txt
diff --git a/es2panda/test/parser/js/test-string-literal.js b/es2panda/test/parser/js/test_cases/string/test-string-literal.js
similarity index 100%
rename from es2panda/test/parser/js/test-string-literal.js
rename to es2panda/test/parser/js/test_cases/string/test-string-literal.js
diff --git a/es2panda/test/parser/js/test_ansi_string-expected.txt b/es2panda/test/parser/js/test_cases/string/test_ansi_string-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_ansi_string-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_ansi_string-expected.txt
diff --git a/es2panda/test/parser/js/test_ansi_string.js b/es2panda/test/parser/js/test_cases/string/test_ansi_string.js
similarity index 100%
rename from es2panda/test/parser/js/test_ansi_string.js
rename to es2panda/test/parser/js/test_cases/string/test_ansi_string.js
diff --git a/es2panda/test/parser/js/test_template_string-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string.js b/es2panda/test/parser/js/test_cases/string/test_template_string.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string.js
diff --git a/es2panda/test/parser/js/test_template_string1-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string1-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string1-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string1.js b/es2panda/test/parser/js/test_cases/string/test_template_string1.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string1.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string1.js
diff --git a/es2panda/test/parser/js/test_template_string2-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string2-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string2-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string2.js b/es2panda/test/parser/js/test_cases/string/test_template_string2.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string2.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string2.js
diff --git a/es2panda/test/parser/js/test_template_string3-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string3-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string3-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string3.js b/es2panda/test/parser/js/test_cases/string/test_template_string3.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string3.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string3.js
diff --git a/es2panda/test/parser/js/test_template_string4-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string4-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string4-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string4-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string4.js b/es2panda/test/parser/js/test_cases/string/test_template_string4.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string4.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string4.js
diff --git a/es2panda/test/parser/js/test_template_string5-expected.txt b/es2panda/test/parser/js/test_cases/string/test_template_string5-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test_template_string5-expected.txt
rename to es2panda/test/parser/js/test_cases/string/test_template_string5-expected.txt
diff --git a/es2panda/test/parser/js/test_template_string5.js b/es2panda/test/parser/js/test_cases/string/test_template_string5.js
similarity index 100%
rename from es2panda/test/parser/js/test_template_string5.js
rename to es2panda/test/parser/js/test_cases/string/test_template_string5.js
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-1-expected.txt b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-1-expected.txt
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-1-expected.txt
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-1.js b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-1.js
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-1.js
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-1.js
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-2-expected.txt b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-2-expected.txt
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-2-expected.txt
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-2.js b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-2.js
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-2.js
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-2.js
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-3-expected.txt b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-3-expected.txt
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-3-expected.txt
diff --git a/es2panda/test/parser/js/test-wrong-function-decl-3.js b/es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-3.js
similarity index 100%
rename from es2panda/test/parser/js/test-wrong-function-decl-3.js
rename to es2panda/test/parser/js/test_cases/wrong-function-decl/test-wrong-function-decl-3.js
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor1-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor1-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor1-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor1.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor1.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor1.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor10-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor10-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor10-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor10.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor10.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor10.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor2-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor2-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor2-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor2.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor2.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor2.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor3-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor3-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor3-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor3.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor3.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor3.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor4-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor4-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor4-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor4.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor4.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor4.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor5-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor5-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor5-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor5.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor5.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor5.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor6-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor6-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor6-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor6.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor6.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor6.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor7-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor7-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor7-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor7.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor7.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor7.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor8-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor8-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor8-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor8.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor8.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor8.ts
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor9-expected.txt b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor9-expected.txt
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor9-expected.txt
diff --git a/es2panda/test/parser/ts/test_GetOrSetAccessor9.ts b/es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_GetOrSetAccessor9.ts
rename to es2panda/test/parser/ts/test_cases/GetOrSetAccessor/test_GetOrSetAccessor9.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-1-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-1.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-1.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-1.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-2-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-2.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-2.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-2.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-3-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-3-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-3.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-3.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-3.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-4-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-4-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-4-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-4.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-4.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-4.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-5-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-5-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-5-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-5.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-5.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-5.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-6-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-6-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-6-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-6.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-6.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-6.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-7-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-7-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-7-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-7.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-7.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-7.ts
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-8-expected.txt b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-8-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-8-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-auto-accessor-8.ts b/es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-auto-accessor-8.ts
rename to es2panda/test/parser/ts/test_cases/class/accessor/test-class-auto-accessor-8.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor1-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor1.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor1.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor1.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor10-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor10-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor10-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor10.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor10.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor10.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor11-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor11-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor11-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor11.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor11.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor11.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor12-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor12-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor12-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor12.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor12.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor12.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor13-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor13-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor13-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor13.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor13.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor13.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor14-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor14-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor14-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor14-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor14.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor14.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor14.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor14.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor15-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor15-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor15-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor15-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor15.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor15.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor15.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor15.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor16-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor16-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor16-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor16-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor16.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor16.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor16.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor16.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor17-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor17-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor17-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor17-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor17.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor17.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor17.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor17.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor18-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor18-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor18-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor18-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor18.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor18.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor18.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor18.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor19-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor19-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor19-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor19-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor19.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor19.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor19.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor19.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor2-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor2.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor2.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor2.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor3-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor3-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor3.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor3.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor3.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor4-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor4-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor4-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor4.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor4.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor4.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor5-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor5-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor5-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor5.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor5.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor5.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor6-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor6-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor6-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor6.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor6.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor6.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor7-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor7-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor7-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor7.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor7.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor7.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor8-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor8-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor8-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor8.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor8.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor8.ts
diff --git a/es2panda/test/parser/ts/test-class-constructor9-expected.txt b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor9-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor9-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-constructor9.ts b/es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-constructor9.ts
rename to es2panda/test/parser/ts/test_cases/class/constructor/test-class-constructor9.ts
diff --git a/es2panda/test/parser/ts/test-destructure-declaration-expected.txt b/es2panda/test/parser/ts/test_cases/class/declaration/test-destructure-declaration-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-destructure-declaration-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/declaration/test-destructure-declaration-expected.txt
diff --git a/es2panda/test/parser/ts/test-destructure-declaration.ts b/es2panda/test/parser/ts/test_cases/class/declaration/test-destructure-declaration.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-destructure-declaration.ts
rename to es2panda/test/parser/ts/test_cases/class/declaration/test-destructure-declaration.ts
diff --git a/es2panda/test/parser/ts/test-declare-name-expected.txt b/es2panda/test/parser/ts/test_cases/class/declare/test-declare-name-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-declare-name-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/declare/test-declare-name-expected.txt
diff --git a/es2panda/test/parser/ts/test-declare-name.ts b/es2panda/test/parser/ts/test_cases/class/declare/test-declare-name.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-declare-name.ts
rename to es2panda/test/parser/ts/test_cases/class/declare/test-declare-name.ts
diff --git a/es2panda/test/parser/ts/test-class-definition-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definition.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition.ts
diff --git a/es2panda/test/parser/ts/test-class-definition27-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition27-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition27-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition27-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definition27.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition27.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition27.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition27.ts
diff --git a/es2panda/test/parser/ts/test-class-definition28-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition28-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition28-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition28-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definition28.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition28.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition28.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition28.ts
diff --git a/es2panda/test/parser/ts/test-class-definition29-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition29-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition29-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition29-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definition29.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition29.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition29.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition29.ts
diff --git a/es2panda/test/parser/ts/test-class-definition30-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition30-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition30-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition30-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definition30.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definition30.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definition30.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definition30.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton1-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton1.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton1.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton1.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton10-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton10-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton10-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton10.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton10.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton10.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton11-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton11-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton11-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton11.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton11.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton11.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton12-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton12-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton12-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton12.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton12.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton12.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton13-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton13-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton13-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton13.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton13.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton13.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton14-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton14-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton14-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton14-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton14.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton14.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton14.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton14.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton15-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton15-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton15-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton15-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton15.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton15.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton15.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton15.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton16-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton16-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton16-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton16-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton16.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton16.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton16.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton16.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton17-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton17-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton17-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton17-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton17.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton17.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton17.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton17.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton18-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton18-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton18-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton18-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton18.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton18.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton18.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton18.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton19-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton19-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton19-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton19-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton19.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton19.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton19.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton19.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton2-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton2.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton2.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton2.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton20-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton20-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton20-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton20-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton20.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton20.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton20.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton20.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton3-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton3-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton3.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton3.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton3.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton4-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton4-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton4-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton4.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton4.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton4.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton5-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton5-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton5-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton5.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton5.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton5.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton6-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton6-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton6-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton6.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton6.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton6.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton7-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton7-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton7-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton7.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton7.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton7.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton8-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton8-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton8-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton8.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton8.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton8.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton9-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton9-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton9-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton9.ts b/es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton9.ts
rename to es2panda/test/parser/ts/test_cases/class/definition/test-class-definiton9.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton21-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton21-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton21-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton21-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton21.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton21.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton21.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton21.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton22-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton22-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton22-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton22-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton22.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton22.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton22.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton22.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton23-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton23-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton23-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton23-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton23.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton23.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton23.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton23.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton24-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton24-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton24-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton24-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton24.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton24.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton24.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton24.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton25-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton25-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton25-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton25-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton25.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton25.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton25.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton25.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton26-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton26-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton26-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton26-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton26.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton26.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton26.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton26.ts
diff --git a/es2panda/test/parser/ts/test-class-definiton27-expected.txt b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton27-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton27-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton27-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-definiton27.ts b/es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton27.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-definiton27.ts
rename to es2panda/test/parser/ts/test_cases/class/definition_2/test-class-definiton27.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-1-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-1.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-1.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-1.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-10-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-10-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-10-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-10.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-10.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-10.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-11-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-11-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-11-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-11.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-11.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-11.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-12-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-12-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-12-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-12.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-12.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-12.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-2-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-2.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-2.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-2.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-3-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-3.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-3.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-3.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-4-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-4-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-4.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-4.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-4.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-5-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-5-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-5.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-5.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-5.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-6-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-6-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-6.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-6.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-6.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-7-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-7-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-7-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-7.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-7.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-7.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-8-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-8-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-8-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-8.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-8.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-8.ts
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-9-expected.txt b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-9-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-9-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-private-class-element-9.ts b/es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-private-class-element-9.ts
rename to es2panda/test/parser/ts/test_cases/class/element/test-ts-private-class-element-9.ts
diff --git a/es2panda/test/parser/ts/test-class-method-optional-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-optional-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-optional-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-optional-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-optional.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-optional.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-optional.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-optional.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload1-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload1.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload1.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload1.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload10-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload10-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload10-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload10.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload10.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload10.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload11-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload11-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload11-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload11.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload11.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload11.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload12-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload12-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload12-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload12.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload12.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload12.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload13-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload13-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload13-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload13.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload13.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload13.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload2-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload2.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload2.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload2.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload3-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload3-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload3.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload3.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload3.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload4-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload4-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload4-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload4.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload4.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload4.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload5-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload5-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload5-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload5.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload5.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload5.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload6-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload6-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload6-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload6.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload6.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload6.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload7-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload7-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload7-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload7.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload7.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload7.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload8-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload8-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload8-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload8.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload8.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload8.ts
diff --git a/es2panda/test/parser/ts/test-class-method-overload9-expected.txt b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload9-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload9-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-method-overload9.ts b/es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-method-overload9.ts
rename to es2panda/test/parser/ts/test_cases/class/method-overload/test-class-method-overload9.ts
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-1-expected.txt b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-1.ts b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-1.ts
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-1.ts
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-2-expected.txt b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-2.ts b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-2.ts
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-2.ts
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-3-expected.txt b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-3-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-3-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-modifier-keywords-3.ts b/es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-modifier-keywords-3.ts
rename to es2panda/test/parser/ts/test_cases/class/modifier-keyword/test-class-modifier-keywords-3.ts
diff --git a/es2panda/test/parser/ts/test-class-property-1-expected.txt b/es2panda/test/parser/ts/test_cases/class/property/test-class-property-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-property-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/property/test-class-property-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-property-1.ts b/es2panda/test/parser/ts/test_cases/class/property/test-class-property-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-property-1.ts
rename to es2panda/test/parser/ts/test_cases/class/property/test-class-property-1.ts
diff --git a/es2panda/test/parser/ts/test-class-property-2-expected.txt b/es2panda/test/parser/ts/test_cases/class/property/test-class-property-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-property-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/property/test-class-property-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-property-2.ts b/es2panda/test/parser/ts/test_cases/class/property/test-class-property-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-property-2.ts
rename to es2panda/test/parser/ts/test_cases/class/property/test-class-property-2.ts
diff --git a/es2panda/test/parser/ts/test-class-super-1-expected.txt b/es2panda/test/parser/ts/test_cases/class/super/test-class-super-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-class-super-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/class/super/test-class-super-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-class-super-1.ts b/es2panda/test/parser/ts/test_cases/class/super/test-class-super-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-class-super-1.ts
rename to es2panda/test/parser/ts/test_cases/class/super/test-class-super-1.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type1-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type1-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type1.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type1.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type1.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type2-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type2.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type2.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type2.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type3-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type3.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type3.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type3.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type4-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type4-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type4.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type4.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type4.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type5-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type5-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type5.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type5.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type5.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type6-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type6-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type6.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type6.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type6.ts
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type7-expected.txt b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type7-expected.txt
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type7-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-conditional-type7.ts b/es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-conditional-type7.ts
rename to es2panda/test/parser/ts/test_cases/conditional/test-ts-conditional-type7.ts
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type1-expected.txt b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type1-expected.txt
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type1.ts b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type1.ts
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type1.ts
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type2-expected.txt b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type2.ts b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type2.ts
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type2.ts
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type3-expected.txt b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type3.ts b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type3.ts
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type3.ts
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type4-expected.txt b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type4-expected.txt
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-constructor-type4.ts b/es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-constructor-type4.ts
rename to es2panda/test/parser/ts/test_cases/constructor/test-ts-constructor-type4.ts
diff --git a/es2panda/test/parser/ts/test_decorator-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator.ts
diff --git a/es2panda/test/parser/ts/test_decorator1-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator1-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator1-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator1.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator1.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator1.ts
diff --git a/es2panda/test/parser/ts/test_decorator2-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator2-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator2-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator2.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator2.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator2.ts
diff --git a/es2panda/test/parser/ts/test_decorator3-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator3-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator3-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator3.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator3.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator3.ts
diff --git a/es2panda/test/parser/ts/test_decorator4-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator4-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator4-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator4.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator4.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator4.ts
diff --git a/es2panda/test/parser/ts/test_decorator5-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator5-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator5-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator5.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator5.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator5.ts
diff --git a/es2panda/test/parser/ts/test_decorator6-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator6-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator6-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator6.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator6.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator6.ts
diff --git a/es2panda/test/parser/ts/test_decorator7-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator7-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator7-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator7.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator7.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator7.ts
diff --git a/es2panda/test/parser/ts/test_decorator8-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator8-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator8-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator8.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator8.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator8.ts
diff --git a/es2panda/test/parser/ts/test_decorator9-expected.txt b/es2panda/test/parser/ts/test_cases/decorator/test_decorator9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator9-expected.txt
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator9-expected.txt
diff --git a/es2panda/test/parser/ts/test_decorator9.ts b/es2panda/test/parser/ts/test_cases/decorator/test_decorator9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_decorator9.ts
rename to es2panda/test/parser/ts/test_cases/decorator/test_decorator9.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration1-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration1-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration1-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration1.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration1.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration1.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration2-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration2-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration2-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration2.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration2.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration2.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration3-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration3-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration3-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration3.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration3.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration3.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration4-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration4-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration4-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration4.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration4.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration4.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration5-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration5-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration5-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration5.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration5.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration5.ts
diff --git a/es2panda/test/parser/ts/test-enum-declaration6-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration6-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration6-expected.txt
diff --git a/es2panda/test/parser/ts/test-enum-declaration6.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-enum-declaration6.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-enum-declaration6.ts
diff --git a/es2panda/test/parser/ts/test-export-declaration1-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration1-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration1-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-declaration1.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration1.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration1.ts
diff --git a/es2panda/test/parser/ts/test-export-declaration2-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration2-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration2-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-declaration2.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration2.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration2.ts
diff --git a/es2panda/test/parser/ts/test-export-declaration3-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration3-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration3-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-declaration3.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration3.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration3.ts
diff --git a/es2panda/test/parser/ts/test-export-declaration4-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration4-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration4-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-declaration4.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration4.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration4.ts
diff --git a/es2panda/test/parser/ts/test-export-declaration5-expected.txt b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration5-expected.txt
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration5-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-declaration5.ts b/es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-declaration5.ts
rename to es2panda/test/parser/ts/test_cases/enum-declaration/test-export-declaration5.ts
diff --git a/es2panda/test/parser/ts/test-export-function-expected.txt b/es2panda/test/parser/ts/test_cases/export/test-export-function-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-function-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test-export-function-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-function.ts b/es2panda/test/parser/ts/test_cases/export/test-export-function.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-function.ts
rename to es2panda/test/parser/ts/test_cases/export/test-export-function.ts
diff --git a/es2panda/test/parser/ts/test-export-interface-expected.txt b/es2panda/test/parser/ts/test_cases/export/test-export-interface-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-interface-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test-export-interface-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-interface.ts b/es2panda/test/parser/ts/test_cases/export/test-export-interface.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-interface.ts
rename to es2panda/test/parser/ts/test_cases/export/test-export-interface.ts
diff --git a/es2panda/test/parser/ts/test-export-type-expected.txt b/es2panda/test/parser/ts/test_cases/export/test-export-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-export-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test-export-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-export-type.ts b/es2panda/test/parser/ts/test_cases/export/test-export-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-export-type.ts
rename to es2panda/test/parser/ts/test_cases/export/test-export-type.ts
diff --git a/es2panda/test/parser/ts/test_export-declaration-named-namespace-error-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-error-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export-declaration-named-namespace-error-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-error-expected.txt
diff --git a/es2panda/test/parser/ts/test_export-declaration-named-namespace-error.ts b/es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-error.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export-declaration-named-namespace-error.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-error.ts
diff --git a/es2panda/test/parser/ts/test_export-declaration-named-namespace-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export-declaration-named-namespace-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace-expected.txt
diff --git a/es2panda/test/parser/ts/test_export-declaration-named-namespace.ts b/es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export-declaration-named-namespace.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export-declaration-named-namespace.ts
diff --git a/es2panda/test/parser/ts/test_export-function-overload-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export-function-overload-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export-function-overload-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export-function-overload-expected.txt
diff --git a/es2panda/test/parser/ts/test_export-function-overload.ts b/es2panda/test/parser/ts/test_cases/export/test_export-function-overload.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export-function-overload.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export-function-overload.ts
diff --git a/es2panda/test/parser/ts/test_export_AssertClause1-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export_AssertClause1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export_AssertClause1-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export_AssertClause1-expected.txt
diff --git a/es2panda/test/parser/ts/test_export_AssertClause1.ts b/es2panda/test/parser/ts/test_cases/export/test_export_AssertClause1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export_AssertClause1.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export_AssertClause1.ts
diff --git a/es2panda/test/parser/ts/test_export_AssertClause2-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export_AssertClause2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export_AssertClause2-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export_AssertClause2-expected.txt
diff --git a/es2panda/test/parser/ts/test_export_AssertClause2.ts b/es2panda/test/parser/ts/test_cases/export/test_export_AssertClause2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export_AssertClause2.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export_AssertClause2.ts
diff --git a/es2panda/test/parser/ts/test_export_type-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export_type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export_type-expected.txt
diff --git a/es2panda/test/parser/ts/test_export_type.ts b/es2panda/test/parser/ts/test_cases/export/test_export_type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export_type.ts
diff --git a/es2panda/test/parser/ts/test_export_type2-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export_type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export_type2-expected.txt
diff --git a/es2panda/test/parser/ts/test_export_type2.ts b/es2panda/test/parser/ts/test_cases/export/test_export_type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type2.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export_type2.ts
diff --git a/es2panda/test/parser/ts/test_export_type3-expected.txt b/es2panda/test/parser/ts/test_cases/export/test_export_type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/export/test_export_type3-expected.txt
diff --git a/es2panda/test/parser/ts/test_export_type3.ts b/es2panda/test/parser/ts/test_cases/export/test_export_type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_export_type3.ts
rename to es2panda/test/parser/ts/test_cases/export/test_export_type3.ts
diff --git a/es2panda/test/parser/ts/test-as-expression-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression.ts
diff --git a/es2panda/test/parser/ts/test-as-expression1-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression1-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression1-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression1.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression1.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression1.ts
diff --git a/es2panda/test/parser/ts/test-as-expression2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression2-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression2.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression2.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression2.ts
diff --git a/es2panda/test/parser/ts/test-as-expression3-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression3-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression3-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression3.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression3.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression3.ts
diff --git a/es2panda/test/parser/ts/test-as-expression4-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression4-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression4-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression4.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression4.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression4.ts
diff --git a/es2panda/test/parser/ts/test-as-expression5-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression5-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression5-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression5.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression5.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression5.ts
diff --git a/es2panda/test/parser/ts/test-as-expression6-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression6-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression6-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression6.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression6.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression6.ts
diff --git a/es2panda/test/parser/ts/test-as-expression7-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression7-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression7-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression7.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression7.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression7.ts
diff --git a/es2panda/test/parser/ts/test-as-expression8-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression8-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression8-expected.txt
diff --git a/es2panda/test/parser/ts/test-as-expression8.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-as-expression8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-as-expression8.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-as-expression8.ts
diff --git a/es2panda/test/parser/ts/test-ts-as-expression-expected.txt b/es2panda/test/parser/ts/test_cases/expression/as/test-ts-as-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-as-expression-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/as/test-ts-as-expression-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-as-expression.ts b/es2panda/test/parser/ts/test_cases/expression/as/test-ts-as-expression.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-as-expression.ts
rename to es2panda/test/parser/ts/test_cases/expression/as/test-ts-as-expression.ts
diff --git a/es2panda/test/parser/ts/test-conditional-expression-expected.txt b/es2panda/test/parser/ts/test_cases/expression/conditional/test-conditional-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-conditional-expression-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/conditional/test-conditional-expression-expected.txt
diff --git a/es2panda/test/parser/ts/test-conditional-expression.ts b/es2panda/test/parser/ts/test_cases/expression/conditional/test-conditional-expression.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-conditional-expression.ts
rename to es2panda/test/parser/ts/test_cases/expression/conditional/test-conditional-expression.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions1-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions1-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions1-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions1.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions1.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions1.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions2-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions2.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions2.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions2.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions3-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions3-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions3-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions3.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions3.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions3.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions4-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions4-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions4-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions4.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions4.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions4.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions5-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions5-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions5-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions5.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions5.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions5.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions6-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions6-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions6-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions6.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions6.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions6.ts
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions7-expected.txt b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions7-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions7-expected.txt
diff --git a/es2panda/test/parser/ts/test_instantiation_expressions7.ts b/es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_instantiation_expressions7.ts
rename to es2panda/test/parser/ts/test_cases/expression/instantiation/test_instantiation_expressions7.ts
diff --git a/es2panda/test/parser/ts/test-lessThan-expression1-expected.txt b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression1-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression1-expected.txt
diff --git a/es2panda/test/parser/ts/test-lessThan-expression1.ts b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression1.ts
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression1.ts
diff --git a/es2panda/test/parser/ts/test-lessThan-expression2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression2-expected.txt
diff --git a/es2panda/test/parser/ts/test-lessThan-expression2.ts b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression2.ts
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression2.ts
diff --git a/es2panda/test/parser/ts/test-lessThan-expression3-expected.txt b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression3-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression3-expected.txt
diff --git a/es2panda/test/parser/ts/test-lessThan-expression3.ts b/es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-lessThan-expression3.ts
rename to es2panda/test/parser/ts/test_cases/expression/less-than/test-lessThan-expression3.ts
diff --git a/es2panda/test/parser/ts/test-member-expression1-expected.txt b/es2panda/test/parser/ts/test_cases/expression/member/test-member-expression1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-member-expression1-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/member/test-member-expression1-expected.txt
diff --git a/es2panda/test/parser/ts/test-member-expression1.ts b/es2panda/test/parser/ts/test_cases/expression/member/test-member-expression1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-member-expression1.ts
rename to es2panda/test/parser/ts/test_cases/expression/member/test-member-expression1.ts
diff --git a/es2panda/test/parser/ts/test-member-expression2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/member/test-member-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-member-expression2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/member/test-member-expression2-expected.txt
diff --git a/es2panda/test/parser/ts/test-member-expression2.ts b/es2panda/test/parser/ts/test_cases/expression/member/test-member-expression2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-member-expression2.ts
rename to es2panda/test/parser/ts/test_cases/expression/member/test-member-expression2.ts
diff --git a/es2panda/test/parser/ts/test-new-expression1-expected.txt b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression1-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression1-expected.txt
diff --git a/es2panda/test/parser/ts/test-new-expression1.ts b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression1.ts
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression1.ts
diff --git a/es2panda/test/parser/ts/test-new-expression2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression2-expected.txt
diff --git a/es2panda/test/parser/ts/test-new-expression2.ts b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression2.ts
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression2.ts
diff --git a/es2panda/test/parser/ts/test-new-expression3-expected.txt b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression3-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression3-expected.txt
diff --git a/es2panda/test/parser/ts/test-new-expression3.ts b/es2panda/test/parser/ts/test_cases/expression/new/test-new-expression3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-new-expression3.ts
rename to es2panda/test/parser/ts/test_cases/expression/new/test-new-expression3.ts
diff --git a/es2panda/test/parser/ts/test-ts-non-null-expression-expected.txt b/es2panda/test/parser/ts/test_cases/expression/non-null/test-ts-non-null-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-non-null-expression-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/non-null/test-ts-non-null-expression-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-non-null-expression.ts b/es2panda/test/parser/ts/test_cases/expression/non-null/test-ts-non-null-expression.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-non-null-expression.ts
rename to es2panda/test/parser/ts/test_cases/expression/non-null/test-ts-non-null-expression.ts
diff --git a/es2panda/test/parser/ts/test-object-expression-expected.txt b/es2panda/test/parser/ts/test_cases/expression/object/test-object-expression-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-object-expression-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/object/test-object-expression-expected.txt
diff --git a/es2panda/test/parser/ts/test-object-expression.ts b/es2panda/test/parser/ts/test_cases/expression/object/test-object-expression.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-object-expression.ts
rename to es2panda/test/parser/ts/test_cases/expression/object/test-object-expression.ts
diff --git a/es2panda/test/parser/ts/test-object-expression2-expected.txt b/es2panda/test/parser/ts/test_cases/expression/object/test-object-expression2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-object-expression2-expected.txt
rename to es2panda/test/parser/ts/test_cases/expression/object/test-object-expression2-expected.txt
diff --git a/es2panda/test/parser/ts/test-object-expression2.ts b/es2panda/test/parser/ts/test_cases/expression/object/test-object-expression2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-object-expression2.ts
rename to es2panda/test/parser/ts/test_cases/expression/object/test-object-expression2.ts
diff --git a/es2panda/test/parser/ts/test-arrow-function-expected.txt b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function-expected.txt
diff --git a/es2panda/test/parser/ts/test-arrow-function.ts b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function.ts
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function.ts
diff --git a/es2panda/test/parser/ts/test-arrow-function1-expected.txt b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function1-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function1-expected.txt
diff --git a/es2panda/test/parser/ts/test-arrow-function1.ts b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function1.ts
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function1.ts
diff --git a/es2panda/test/parser/ts/test-arrow-function2-expected.txt b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function2-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function2-expected.txt
diff --git a/es2panda/test/parser/ts/test-arrow-function2.ts b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function2.ts
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function2.ts
diff --git a/es2panda/test/parser/ts/test-arrow-function3-expected.txt b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function3-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function3-expected.txt
diff --git a/es2panda/test/parser/ts/test-arrow-function3.ts b/es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-arrow-function3.ts
rename to es2panda/test/parser/ts/test_cases/function/arrow/test-arrow-function3.ts
diff --git a/es2panda/test/parser/ts/test-func-decl1-expected.txt b/es2panda/test/parser/ts/test_cases/function/others/test-func-decl1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-decl1-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/others/test-func-decl1-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-decl1.ts b/es2panda/test/parser/ts/test_cases/function/others/test-func-decl1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-decl1.ts
rename to es2panda/test/parser/ts/test_cases/function/others/test-func-decl1.ts
diff --git a/es2panda/test/parser/ts/test-function-generic-expected.txt b/es2panda/test/parser/ts/test_cases/function/others/test-function-generic-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-generic-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-generic-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-generic.ts b/es2panda/test/parser/ts/test_cases/function/others/test-function-generic.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-generic.ts
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-generic.ts
diff --git a/es2panda/test/parser/ts/test-function-name-1-expected.txt b/es2panda/test/parser/ts/test_cases/function/others/test-function-name-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-name-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-name-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-name-1.ts b/es2panda/test/parser/ts/test_cases/function/others/test-function-name-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-name-1.ts
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-name-1.ts
diff --git a/es2panda/test/parser/ts/test-function-with-type-assertion-expected.txt b/es2panda/test/parser/ts/test_cases/function/others/test-function-with-type-assertion-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-with-type-assertion-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-with-type-assertion-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-with-type-assertion.ts b/es2panda/test/parser/ts/test_cases/function/others/test-function-with-type-assertion.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-with-type-assertion.ts
rename to es2panda/test/parser/ts/test_cases/function/others/test-function-with-type-assertion.ts
diff --git a/es2panda/test/parser/ts/test-function-overload-expected.txt b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-overload.ts b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload.ts
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload.ts
diff --git a/es2panda/test/parser/ts/test-function-overload1-expected.txt b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload1-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload1-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-overload1.ts b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload1.ts
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload1.ts
diff --git a/es2panda/test/parser/ts/test-function-overload2-expected.txt b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload2-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload2-expected.txt
diff --git a/es2panda/test/parser/ts/test-function-overload2.ts b/es2panda/test/parser/ts/test_cases/function/overload/test-function-overload2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-function-overload2.ts
rename to es2panda/test/parser/ts/test_cases/function/overload/test-function-overload2.ts
diff --git a/es2panda/test/parser/ts/test-func-param-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param.ts
diff --git a/es2panda/test/parser/ts/test-func-param1-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param1-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param1-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param1.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param1.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param1.ts
diff --git a/es2panda/test/parser/ts/test-func-param2-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param2-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param2-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param2.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param2.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param2.ts
diff --git a/es2panda/test/parser/ts/test-func-param3-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param3-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param3-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param3.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param3.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param3.ts
diff --git a/es2panda/test/parser/ts/test-func-param4-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param4-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param4-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param4.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param4.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param4.ts
diff --git a/es2panda/test/parser/ts/test-func-param5-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param5-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param5-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param5.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param5.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param5.ts
diff --git a/es2panda/test/parser/ts/test-func-param6-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param6-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param6-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param6.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param6.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param6.ts
diff --git a/es2panda/test/parser/ts/test-func-param7-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param7-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param7-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param7.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param7.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param7.ts
diff --git a/es2panda/test/parser/ts/test-func-param8-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param8-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param8-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param8.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param8.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param8.ts
diff --git a/es2panda/test/parser/ts/test-func-param9-expected.txt b/es2panda/test/parser/ts/test_cases/function/param/test-func-param9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param9-expected.txt
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param9-expected.txt
diff --git a/es2panda/test/parser/ts/test-func-param9.ts b/es2panda/test/parser/ts/test_cases/function/param/test-func-param9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-func-param9.ts
rename to es2panda/test/parser/ts/test_cases/function/param/test-func-param9.ts
diff --git a/es2panda/test/parser/ts/test-if-expected.txt b/es2panda/test/parser/ts/test_cases/if/test-if-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-if-expected.txt
rename to es2panda/test/parser/ts/test_cases/if/test-if-expected.txt
diff --git a/es2panda/test/parser/ts/test-if.ts b/es2panda/test/parser/ts/test_cases/if/test-if.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-if.ts
rename to es2panda/test/parser/ts/test_cases/if/test-if.ts
diff --git a/es2panda/test/parser/ts/test-cyclic-module-import-expected.txt b/es2panda/test/parser/ts/test_cases/import/test-cyclic-module-import-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-cyclic-module-import-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test-cyclic-module-import-expected.txt
diff --git a/es2panda/test/parser/ts/test-cyclic-module-import.ts b/es2panda/test/parser/ts/test_cases/import/test-cyclic-module-import.ts
similarity index 96%
rename from es2panda/test/parser/ts/test-cyclic-module-import.ts
rename to es2panda/test/parser/ts/test_cases/import/test-cyclic-module-import.ts
index 6068088306e3aed2d0dc5d20312ed84a6e1c6340..262f8c32d5ef31ba455a05a890219e74d6f02394 100644
--- a/es2panda/test/parser/ts/test-cyclic-module-import.ts
+++ b/es2panda/test/parser/ts/test_cases/import/test-cyclic-module-import.ts
@@ -1,36 +1,36 @@
-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-// @declaration: true
-declare module "ModuleSub" {
-    import TargetModule = require('TargetModule');
-    class ModuleSub {
-        public static StaticVar: number;
-        public InsVar: number;
-        public main: TargetModule;
-        constructor();
-    }
-    export = ModuleSub;
-}
-
-declare module "TargetModule" {
-    import ModuleSub = require('ModuleSub');
-    class TargetModule {
-        public moduleSub: ModuleSub;
-        constructor();
-    }
-    export = TargetModule;
-}
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+// @declaration: true
+declare module "ModuleSub" {
+    import TargetModule = require('TargetModule');
+    class ModuleSub {
+        public static StaticVar: number;
+        public InsVar: number;
+        public main: TargetModule;
+        constructor();
+    }
+    export = ModuleSub;
+}
+
+declare module "TargetModule" {
+    import ModuleSub = require('ModuleSub');
+    class TargetModule {
+        public moduleSub: ModuleSub;
+        constructor();
+    }
+    export = TargetModule;
+}
diff --git a/es2panda/test/parser/ts/test-import-type-expected.txt b/es2panda/test/parser/ts/test_cases/import/test-import-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-import-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test-import-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-import-type-source-expected.txt b/es2panda/test/parser/ts/test_cases/import/test-import-type-source-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-import-type-source-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test-import-type-source-expected.txt
diff --git a/es2panda/test/parser/ts/test-import-type-source.ts b/es2panda/test/parser/ts/test_cases/import/test-import-type-source.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-import-type-source.ts
rename to es2panda/test/parser/ts/test_cases/import/test-import-type-source.ts
diff --git a/es2panda/test/parser/ts/test-import-type.ts b/es2panda/test/parser/ts/test_cases/import/test-import-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-import-type.ts
rename to es2panda/test/parser/ts/test_cases/import/test-import-type.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause1-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause1-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause1-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause1.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause1.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause1.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause2-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause2-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause2-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause2.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause2.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause2.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause3-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause3-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause3-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause3.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause3.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause3.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause4-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause4-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause4-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause4.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause4.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause4.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause5-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause5-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause5-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause5.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause5.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause5.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause6-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause6-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause6-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause6.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause6.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause6.ts
diff --git a/es2panda/test/parser/ts/test_import_AssertClause7-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause7-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause7-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_AssertClause7.ts b/es2panda/test/parser/ts/test_cases/import/test_import_AssertClause7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_AssertClause7.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_AssertClause7.ts
diff --git a/es2panda/test/parser/ts/test_import_type-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_type-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_type.ts b/es2panda/test/parser/ts/test_cases/import/test_import_type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_type.ts
diff --git a/es2panda/test/parser/ts/test_import_type2-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_type2-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_type2.ts b/es2panda/test/parser/ts/test_cases/import/test_import_type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type2.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_type2.ts
diff --git a/es2panda/test/parser/ts/test_import_type3-expected.txt b/es2panda/test/parser/ts/test_cases/import/test_import_type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/import/test_import_type3-expected.txt
diff --git a/es2panda/test/parser/ts/test_import_type3.ts b/es2panda/test/parser/ts/test_cases/import/test_import_type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_import_type3.ts
rename to es2panda/test/parser/ts/test_cases/import/test_import_type3.ts
diff --git a/es2panda/test/parser/ts/test-indexSignature1-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature1-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature1-expected.txt
diff --git a/es2panda/test/parser/ts/test-indexSignature1.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature1.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature1.ts
diff --git a/es2panda/test/parser/ts/test-indexSignature2-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature2-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature2-expected.txt
diff --git a/es2panda/test/parser/ts/test-indexSignature2.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature2.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature2.ts
diff --git a/es2panda/test/parser/ts/test-indexSignature3-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature3-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature3-expected.txt
diff --git a/es2panda/test/parser/ts/test-indexSignature3.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-indexSignature3.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-indexSignature3.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-1-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-1.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-1.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-1.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-2-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-2.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-2.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-2.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-3-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-3-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-3.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-3.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-3.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-4-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-4-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-4.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-4.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-4.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-5-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-5-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-5.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-5.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-5.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-6-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-6-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-6.ts b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-6.ts
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-6.ts
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-expected-transform.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-expected-transform.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-expected-transform.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-expected-transform.txt
diff --git a/es2panda/test/parser/ts/test-ts-index-signature-expected.txt b/es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-index-signature-expected.txt
rename to es2panda/test/parser/ts/test_cases/index-signature/test-ts-index-signature-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface-method-identifier1-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface-method-identifier1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface-method-identifier1-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface-method-identifier1-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface-method-identifier1.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface-method-identifier1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface-method-identifier1.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface-method-identifier1.ts
diff --git a/es2panda/test/parser/ts/test-interface.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface.ts
diff --git a/es2panda/test/parser/ts/test-interface1-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface1-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface1-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface1.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface1.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface1.ts
diff --git a/es2panda/test/parser/ts/test-interface2-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface2-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface2-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface2.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface2.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface2.ts
diff --git a/es2panda/test/parser/ts/test-interface3-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface3-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface3-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface3.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface3.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface3.ts
diff --git a/es2panda/test/parser/ts/test-interface4-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface4-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface4-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface4.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface4.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface4.ts
diff --git a/es2panda/test/parser/ts/test-interface5-expected.txt b/es2panda/test/parser/ts/test_cases/interface/test-interface5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-interface5-expected.txt
rename to es2panda/test/parser/ts/test_cases/interface/test-interface5-expected.txt
diff --git a/es2panda/test/parser/ts/test-interface5.ts b/es2panda/test/parser/ts/test_cases/interface/test-interface5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-interface5.ts
rename to es2panda/test/parser/ts/test_cases/interface/test-interface5.ts
diff --git a/es2panda/test/parser/ts/test-intersection-expected.txt b/es2panda/test/parser/ts/test_cases/intersection/test-intersection-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection-expected.txt
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection-expected.txt
diff --git a/es2panda/test/parser/ts/test-intersection.ts b/es2panda/test/parser/ts/test_cases/intersection/test-intersection.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection.ts
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection.ts
diff --git a/es2panda/test/parser/ts/test-intersection1-expected.txt b/es2panda/test/parser/ts/test_cases/intersection/test-intersection1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection1-expected.txt
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection1-expected.txt
diff --git a/es2panda/test/parser/ts/test-intersection1.ts b/es2panda/test/parser/ts/test_cases/intersection/test-intersection1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection1.ts
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection1.ts
diff --git a/es2panda/test/parser/ts/test-intersection2-expected.txt b/es2panda/test/parser/ts/test_cases/intersection/test-intersection2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection2-expected.txt
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection2-expected.txt
diff --git a/es2panda/test/parser/ts/test-intersection2.ts b/es2panda/test/parser/ts/test_cases/intersection/test-intersection2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection2.ts
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection2.ts
diff --git a/es2panda/test/parser/ts/test-intersection3-expected.txt b/es2panda/test/parser/ts/test_cases/intersection/test-intersection3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection3-expected.txt
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection3-expected.txt
diff --git a/es2panda/test/parser/ts/test-intersection3.ts b/es2panda/test/parser/ts/test_cases/intersection/test-intersection3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-intersection3.ts
rename to es2panda/test/parser/ts/test_cases/intersection/test-intersection3.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare1-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare1-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare1-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare1.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare1.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare1.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare10-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare10-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare10-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare10.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare10.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare10.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare11-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare11-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare11-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare11.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare11.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare11.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare12-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare12-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare12-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare12.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare12.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare12.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare13-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare13-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare13-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare13.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare13.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare13.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare2-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare2-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare2-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare2.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare2.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare2.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare3-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare3-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare3-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare3.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare3.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare3.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare4-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare4-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare4-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare4.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare4.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare4.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare5-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare5-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare5-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare5.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare5.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare5.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare6-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare6-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare6-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare6.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare6.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare6.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare7-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare7-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare7-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare7.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare7.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare7.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare8-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare8-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare8-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare8.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare8.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare8.ts
diff --git a/es2panda/test/parser/ts/test-keyword-declare9-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare9-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare9-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-declare9.ts b/es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-declare9.ts
rename to es2panda/test/parser/ts/test_cases/keyword/declare/test-keyword-declare9.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify1-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify1-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify1-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify1.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify1.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify1.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify2-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify2-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify2-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify2.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify2.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify2.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify3-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify3-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify3-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify3.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify3.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify3.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify4-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify4-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify4-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify4.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify4.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify4.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify5-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify5-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify5-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify5.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify5.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify5.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify6-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify6-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify6-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify6.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify6.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify6.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify7-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify7-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify7-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify7.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify7.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify7.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify8-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify8-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify8-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify8.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify8.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify8.ts
diff --git a/es2panda/test/parser/ts/test-keyword-identify9-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify9-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify9-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-identify9.ts b/es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-identify9.ts
rename to es2panda/test/parser/ts/test_cases/keyword/identify/test-keyword-identify9.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out1-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out1-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out1-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out1.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out1.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out1.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out10-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out10-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out10-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out10.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out10.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out10.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out11-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out11-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out11-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out11.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out11.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out11.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out12-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out12-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out12-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out12.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out12.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out12.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out13-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out13-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out13-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out13.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out13.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out13.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out14-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out14-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out14-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out14-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out14.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out14.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out14.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out14.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out15-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out15-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out15-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out15-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out15.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out15.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out15.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out15.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out16-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out16-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out16-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out16-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out16.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out16.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out16.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out16.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out2-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out2-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out2-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out2.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out2.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out2.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out3-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out3-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out3-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out3.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out3.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out3.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out4-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out4-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out4-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out4.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out4.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out4.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out5-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out5-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out5-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out5.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out5.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out5.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out6-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out6-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out6-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out6.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out6.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out6.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out7-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out7-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out7-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out7.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out7.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out7.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out8-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out8-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out8-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out8.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out8.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out8.ts
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out9-expected.txt b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out9-expected.txt
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out9-expected.txt
diff --git a/es2panda/test/parser/ts/test-keyword-in-and-out9.ts b/es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-keyword-in-and-out9.ts
rename to es2panda/test/parser/ts/test_cases/keyword/in-and-out/test-keyword-in-and-out9.ts
diff --git a/es2panda/test/parser/ts/test_module-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module-expected.txt
diff --git a/es2panda/test/parser/ts/test_module.ts b/es2panda/test/parser/ts/test_cases/module/test_module.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module.ts
diff --git a/es2panda/test/parser/ts/test_module1-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module1-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module1-expected.txt
diff --git a/es2panda/test/parser/ts/test_module1.ts b/es2panda/test/parser/ts/test_cases/module/test_module1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module1.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module1.ts
diff --git a/es2panda/test/parser/ts/test_module10-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module10-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module10-expected.txt
diff --git a/es2panda/test/parser/ts/test_module10.ts b/es2panda/test/parser/ts/test_cases/module/test_module10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module10.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module10.ts
diff --git a/es2panda/test/parser/ts/test_module2-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module2-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module2-expected.txt
diff --git a/es2panda/test/parser/ts/test_module2.ts b/es2panda/test/parser/ts/test_cases/module/test_module2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module2.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module2.ts
diff --git a/es2panda/test/parser/ts/test_module3-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module3-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module3-expected.txt
diff --git a/es2panda/test/parser/ts/test_module3.ts b/es2panda/test/parser/ts/test_cases/module/test_module3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module3.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module3.ts
diff --git a/es2panda/test/parser/ts/test_module4-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module4-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module4-expected.txt
diff --git a/es2panda/test/parser/ts/test_module4.ts b/es2panda/test/parser/ts/test_cases/module/test_module4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module4.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module4.ts
diff --git a/es2panda/test/parser/ts/test_module5-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module5-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module5-expected.txt
diff --git a/es2panda/test/parser/ts/test_module5.ts b/es2panda/test/parser/ts/test_cases/module/test_module5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module5.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module5.ts
diff --git a/es2panda/test/parser/ts/test_module6-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module6-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module6-expected.txt
diff --git a/es2panda/test/parser/ts/test_module6.ts b/es2panda/test/parser/ts/test_cases/module/test_module6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module6.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module6.ts
diff --git a/es2panda/test/parser/ts/test_module7-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module7-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module7-expected.txt
diff --git a/es2panda/test/parser/ts/test_module7.ts b/es2panda/test/parser/ts/test_cases/module/test_module7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module7.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module7.ts
diff --git a/es2panda/test/parser/ts/test_module8-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module8-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module8-expected.txt
diff --git a/es2panda/test/parser/ts/test_module8.ts b/es2panda/test/parser/ts/test_cases/module/test_module8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module8.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module8.ts
diff --git a/es2panda/test/parser/ts/test_module9-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module9-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module9-expected.txt
diff --git a/es2panda/test/parser/ts/test_module9.ts b/es2panda/test/parser/ts/test_cases/module/test_module9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module9.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module9.ts
diff --git a/es2panda/test/parser/ts/test_module_binder-expected.txt b/es2panda/test/parser/ts/test_cases/module/test_module_binder-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_module_binder-expected.txt
rename to es2panda/test/parser/ts/test_cases/module/test_module_binder-expected.txt
diff --git a/es2panda/test/parser/ts/test_module_binder.ts b/es2panda/test/parser/ts/test_cases/module/test_module_binder.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_module_binder.ts
rename to es2panda/test/parser/ts/test_cases/module/test_module_binder.ts
diff --git a/es2panda/test/parser/ts/test-definite-variable-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-definite-variable-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-definite-variable-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-definite-variable-expected.txt
diff --git a/es2panda/test/parser/ts/test-definite-variable.ts b/es2panda/test/parser/ts/test_cases/others/test-definite-variable.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-definite-variable.ts
rename to es2panda/test/parser/ts/test_cases/others/test-definite-variable.ts
diff --git a/es2panda/test/parser/ts/test-labeled-statement-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-labeled-statement-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-labeled-statement-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-labeled-statement-expected.txt
diff --git a/es2panda/test/parser/ts/test-labeled-statement.ts b/es2panda/test/parser/ts/test_cases/others/test-labeled-statement.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-labeled-statement.ts
rename to es2panda/test/parser/ts/test_cases/others/test-labeled-statement.ts
diff --git a/es2panda/test/parser/ts/test-non-null-assertion-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-non-null-assertion-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-non-null-assertion-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-non-null-assertion-expected.txt
diff --git a/es2panda/test/parser/ts/test-non-null-assertion.ts b/es2panda/test/parser/ts/test_cases/others/test-non-null-assertion.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-non-null-assertion.ts
rename to es2panda/test/parser/ts/test_cases/others/test-non-null-assertion.ts
diff --git a/es2panda/test/parser/ts/test-private-identifier-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-private-identifier-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-private-identifier-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-private-identifier-expected.txt
diff --git a/es2panda/test/parser/ts/test-private-identifier.ts b/es2panda/test/parser/ts/test_cases/others/test-private-identifier.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-private-identifier.ts
rename to es2panda/test/parser/ts/test_cases/others/test-private-identifier.ts
diff --git a/es2panda/test/parser/ts/test-ts-key-remapping-via-as-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-ts-key-remapping-via-as-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-key-remapping-via-as-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-ts-key-remapping-via-as-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-key-remapping-via-as.ts b/es2panda/test/parser/ts/test_cases/others/test-ts-key-remapping-via-as.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-key-remapping-via-as.ts
rename to es2panda/test/parser/ts/test_cases/others/test-ts-key-remapping-via-as.ts
diff --git a/es2panda/test/parser/ts/test-without-ending-lf-expected.txt b/es2panda/test/parser/ts/test_cases/others/test-without-ending-lf-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-without-ending-lf-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test-without-ending-lf-expected.txt
diff --git a/es2panda/test/parser/ts/test-without-ending-lf.ts b/es2panda/test/parser/ts/test_cases/others/test-without-ending-lf.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-without-ending-lf.ts
rename to es2panda/test/parser/ts/test_cases/others/test-without-ending-lf.ts
diff --git a/es2panda/test/parser/ts/test_generic-expected.txt b/es2panda/test/parser/ts/test_cases/others/test_generic-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_generic-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test_generic-expected.txt
diff --git a/es2panda/test/parser/ts/test_generic.ts b/es2panda/test/parser/ts/test_cases/others/test_generic.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_generic.ts
rename to es2panda/test/parser/ts/test_cases/others/test_generic.ts
diff --git a/es2panda/test/parser/ts/test_label_break-expected.txt b/es2panda/test/parser/ts/test_cases/others/test_label_break-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_label_break-expected.txt
rename to es2panda/test/parser/ts/test_cases/others/test_label_break-expected.txt
diff --git a/es2panda/test/parser/ts/test_label_break.ts b/es2panda/test/parser/ts/test_cases/others/test_label_break.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_label_break.ts
rename to es2panda/test/parser/ts/test_cases/others/test_label_break.ts
diff --git a/es2panda/test/parser/ts/test_override-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override-expected.txt
diff --git a/es2panda/test/parser/ts/test_override.ts b/es2panda/test/parser/ts/test_cases/override/test_override.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override.ts
diff --git a/es2panda/test/parser/ts/test_override1-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override1-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override1-expected.txt
diff --git a/es2panda/test/parser/ts/test_override1.ts b/es2panda/test/parser/ts/test_cases/override/test_override1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override1.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override1.ts
diff --git a/es2panda/test/parser/ts/test_override2-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override2-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override2-expected.txt
diff --git a/es2panda/test/parser/ts/test_override2.ts b/es2panda/test/parser/ts/test_cases/override/test_override2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override2.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override2.ts
diff --git a/es2panda/test/parser/ts/test_override3-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override3-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override3-expected.txt
diff --git a/es2panda/test/parser/ts/test_override3.ts b/es2panda/test/parser/ts/test_cases/override/test_override3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override3.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override3.ts
diff --git a/es2panda/test/parser/ts/test_override4-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override4-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override4-expected.txt
diff --git a/es2panda/test/parser/ts/test_override4.ts b/es2panda/test/parser/ts/test_cases/override/test_override4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override4.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override4.ts
diff --git a/es2panda/test/parser/ts/test_override5-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override5-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override5-expected.txt
diff --git a/es2panda/test/parser/ts/test_override5.ts b/es2panda/test/parser/ts/test_cases/override/test_override5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override5.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override5.ts
diff --git a/es2panda/test/parser/ts/test_override6-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override6-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override6-expected.txt
diff --git a/es2panda/test/parser/ts/test_override6.ts b/es2panda/test/parser/ts/test_cases/override/test_override6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override6.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override6.ts
diff --git a/es2panda/test/parser/ts/test_override7-expected.txt b/es2panda/test/parser/ts/test_cases/override/test_override7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_override7-expected.txt
rename to es2panda/test/parser/ts/test_cases/override/test_override7-expected.txt
diff --git a/es2panda/test/parser/ts/test_override7.ts b/es2panda/test/parser/ts/test_cases/override/test_override7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_override7.ts
rename to es2panda/test/parser/ts/test_cases/override/test_override7.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property1-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property1-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property1.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property1.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property1.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property10-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property10-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property10-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property10.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property10.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property10.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property11-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property11-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property11-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property11.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property11.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property11.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property12-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property12-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property12-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property12.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property12.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property12.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property2-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property2-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property2.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property2.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property2.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property3-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property3-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property3.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property3.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property3.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property4-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property4-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property4.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property4.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property4.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property5-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property5-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property5.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property5.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property5.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property6-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property6-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property6.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property6.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property6.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property7-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property7-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property7-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property7.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property7.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property7.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property8-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property8-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property8-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property8.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property8.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property8.ts
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property9-expected.txt b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property9-expected.txt
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property9-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-parameter-property9.ts b/es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-parameter-property9.ts
rename to es2panda/test/parser/ts/test_cases/parameter-property/test-ts-parameter-property9.ts
diff --git a/es2panda/test/parser/ts/test_satisfies-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies.ts
diff --git a/es2panda/test/parser/ts/test_satisfies1-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies1-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies1-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies1.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies1.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies1.ts
diff --git a/es2panda/test/parser/ts/test_satisfies10-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies10-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies10-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies10.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies10.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies10.ts
diff --git a/es2panda/test/parser/ts/test_satisfies11-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies11-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies11-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies11-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies11.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies11.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies11.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies11.ts
diff --git a/es2panda/test/parser/ts/test_satisfies12-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies12-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies12-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies12-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies12.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies12.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies12.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies12.ts
diff --git a/es2panda/test/parser/ts/test_satisfies13-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies13-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies13-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies13-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies13.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies13.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies13.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies13.ts
diff --git a/es2panda/test/parser/ts/test_satisfies14-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies14-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies14-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies14-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies14.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies14.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies14.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies14.ts
diff --git a/es2panda/test/parser/ts/test_satisfies2-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies2-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies2-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies2.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies2.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies2.ts
diff --git a/es2panda/test/parser/ts/test_satisfies3-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies3-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies3-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies3.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies3.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies3.ts
diff --git a/es2panda/test/parser/ts/test_satisfies4-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies4-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies4-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies4.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies4.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies4.ts
diff --git a/es2panda/test/parser/ts/test_satisfies5-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies5-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies5-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies5.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies5.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies5.ts
diff --git a/es2panda/test/parser/ts/test_satisfies6-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies6-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies6-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies6.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies6.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies6.ts
diff --git a/es2panda/test/parser/ts/test_satisfies7-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies7-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies7-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies7.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies7.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies7.ts
diff --git a/es2panda/test/parser/ts/test_satisfies8-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies8-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies8-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies8.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies8.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies8.ts
diff --git a/es2panda/test/parser/ts/test_satisfies9-expected.txt b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies9-expected.txt
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies9-expected.txt
diff --git a/es2panda/test/parser/ts/test_satisfies9.ts b/es2panda/test/parser/ts/test_cases/satisfies/test_satisfies9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_satisfies9.ts
rename to es2panda/test/parser/ts/test_cases/satisfies/test_satisfies9.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class1-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class1-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class1-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class1.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class1.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class1.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class2-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class2-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class2-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class2.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class2.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class2.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class3-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class3-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class3-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class3.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class3.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class3.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class4-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class4-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class4-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class4.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class4.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class4.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class5-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class5-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class5-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class5.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class5.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class5.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class6-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class6-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class6-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class6.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class6.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class6.ts
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class7-expected.txt b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class7-expected.txt
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class7-expected.txt
diff --git a/es2panda/test/parser/ts/test-static-blocks-in-class7.ts b/es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-static-blocks-in-class7.ts
rename to es2panda/test/parser/ts/test_cases/static-blocks-in-class/test-static-blocks-in-class7.ts
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-1-expected.txt b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-1-expected.txt
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-1.ts b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-1.ts
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-1.ts
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-2-expected.txt b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-2-expected.txt
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-2.ts b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-2.ts
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-2.ts
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-3-expected.txt b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-3-expected.txt
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-ternary-operator-3.ts b/es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-ternary-operator-3.ts
rename to es2panda/test/parser/ts/test_cases/ternary-operator/test-ts-ternary-operator-3.ts
diff --git a/es2panda/test/parser/ts/test-toplevel-await1-expected.txt b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await1-expected.txt
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await1-expected.txt
diff --git a/es2panda/test/parser/ts/test-toplevel-await1.ts b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await1.ts
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await1.ts
diff --git a/es2panda/test/parser/ts/test-toplevel-await2-expected.txt b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await2-expected.txt
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await2-expected.txt
diff --git a/es2panda/test/parser/ts/test-toplevel-await2.ts b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await2.ts
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await2.ts
diff --git a/es2panda/test/parser/ts/test-toplevel-await3-expected.txt b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await3-expected.txt
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await3-expected.txt
diff --git a/es2panda/test/parser/ts/test-toplevel-await3.ts b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await3.ts
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await3.ts
diff --git a/es2panda/test/parser/ts/test-toplevel-await4-expected.txt b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await4-expected.txt
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await4-expected.txt
diff --git a/es2panda/test/parser/ts/test-toplevel-await4.ts b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await4.ts
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await4.ts
diff --git a/es2panda/test/parser/ts/test-toplevel-await5-expected.txt b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await5-expected.txt
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await5-expected.txt
diff --git a/es2panda/test/parser/ts/test-toplevel-await5.ts b/es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-toplevel-await5.ts
rename to es2panda/test/parser/ts/test_cases/toplevel-await/test-toplevel-await5.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-alias-declaration-expected.txt b/es2panda/test/parser/ts/test_cases/type/alias/test-ts-type-alias-declaration-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-alias-declaration-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/alias/test-ts-type-alias-declaration-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-alias-declaration.ts b/es2panda/test/parser/ts/test_cases/type/alias/test-ts-type-alias-declaration.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-alias-declaration.ts
rename to es2panda/test/parser/ts/test_cases/type/alias/test-ts-type-alias-declaration.ts
diff --git a/es2panda/test/parser/ts/test-type-alias-expected.txt b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-alias.ts b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias.ts
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias.ts
diff --git a/es2panda/test/parser/ts/test-type-alias1-expected.txt b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias1-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-alias1.ts b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias1.ts
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias1.ts
diff --git a/es2panda/test/parser/ts/test-type-alias2-expected.txt b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias2-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-alias2.ts b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias2.ts
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias2.ts
diff --git a/es2panda/test/parser/ts/test-type-alias3-expected.txt b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias3-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-alias3.ts b/es2panda/test/parser/ts/test_cases/type/alias/test-type-alias3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-alias3.ts
rename to es2panda/test/parser/ts/test_cases/type/alias/test-type-alias3.ts
diff --git a/es2panda/test/parser/ts/test-type-annotation-expected.txt b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-annotation.ts b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation.ts
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation.ts
diff --git a/es2panda/test/parser/ts/test-type-annotation1-expected.txt b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation1-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-annotation1.ts b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation1.ts
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation1.ts
diff --git a/es2panda/test/parser/ts/test-type-annotation2-expected.txt b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation2-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-annotation2.ts b/es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-annotation2.ts
rename to es2panda/test/parser/ts/test_cases/type/annotation/test-type-annotation2.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-assertion-expected.txt b/es2panda/test/parser/ts/test_cases/type/assertion/test-ts-type-assertion-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-assertion-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/assertion/test-ts-type-assertion-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-assertion.ts b/es2panda/test/parser/ts/test_cases/type/assertion/test-ts-type-assertion.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-assertion.ts
rename to es2panda/test/parser/ts/test_cases/type/assertion/test-ts-type-assertion.ts
diff --git a/es2panda/test/parser/ts/test-type-literal-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-literal.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal.ts
diff --git a/es2panda/test/parser/ts/test-type-literal1-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal1-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-literal1.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal1.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal1.ts
diff --git a/es2panda/test/parser/ts/test-type-literal2-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal2-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-literal2.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal2.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal2.ts
diff --git a/es2panda/test/parser/ts/test-type-literal3-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal3-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-literal3.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-literal3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-literal3.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-literal3.ts
diff --git a/es2panda/test/parser/ts/test-type-template-literal1-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal1-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-template-literal1.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal1.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal1.ts
diff --git a/es2panda/test/parser/ts/test-type-template-literal2-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal2-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-template-literal2.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal2.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal2.ts
diff --git a/es2panda/test/parser/ts/test-type-template-literal3-expected.txt b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal3-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-template-literal3.ts b/es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-template-literal3.ts
rename to es2panda/test/parser/ts/test_cases/type/literal/test-type-template-literal3.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type1-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type1.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type1.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type1.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type2-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type2.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type2.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type2.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type3-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type3.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type3.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type3.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type4-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type4-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type4.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type4.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type4.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type5-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type5-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type5.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type5.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type5.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type6-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type6-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type6.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type6.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type6.ts
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type7-expected.txt b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type7-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type7-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-mapped-type7.ts b/es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-mapped-type7.ts
rename to es2panda/test/parser/ts/test_cases/type/mapped/test-ts-mapped-type7.ts
diff --git a/es2panda/test/parser/ts/test-ts-unique-symbol-type-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test-ts-unique-symbol-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-unique-symbol-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test-ts-unique-symbol-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-unique-symbol-type.ts b/es2panda/test/parser/ts/test_cases/type/others/test-ts-unique-symbol-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-unique-symbol-type.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test-ts-unique-symbol-type.ts
diff --git a/es2panda/test/parser/ts/test-type-assertion-followedby-another-expr-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test-type-assertion-followedby-another-expr-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-assertion-followedby-another-expr-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-assertion-followedby-another-expr-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-assertion-followedby-another-expr.ts b/es2panda/test/parser/ts/test_cases/type/others/test-type-assertion-followedby-another-expr.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-assertion-followedby-another-expr.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-assertion-followedby-another-expr.ts
diff --git a/es2panda/test/parser/ts/test-type-with-comma-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test-type-with-comma-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-with-comma-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-with-comma-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-with-comma.ts b/es2panda/test/parser/ts/test_cases/type/others/test-type-with-comma.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-with-comma.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-with-comma.ts
diff --git a/es2panda/test/parser/ts/test-type-with-specieal-constructor-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test-type-with-specieal-constructor-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-with-specieal-constructor-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-with-specieal-constructor-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-with-specieal-constructor.ts b/es2panda/test/parser/ts/test_cases/type/others/test-type-with-specieal-constructor.ts
similarity index 96%
rename from es2panda/test/parser/ts/test-type-with-specieal-constructor.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test-type-with-specieal-constructor.ts
index 2000dd2a79e1ca7c3ad57db43b96c186575bc950..c44ed2da526f534b1e3ce40cf34474b563ac34db 100644
--- a/es2panda/test/parser/ts/test-type-with-specieal-constructor.ts
+++ b/es2panda/test/parser/ts/test_cases/type/others/test-type-with-specieal-constructor.ts
@@ -1,32 +1,32 @@
-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-class ClassExample {
-    constructor(a: 'hello');
-    constructor(a: 'bye');
-    constructor(a: string);
-    constructor(a) {
-        return a;
-    }
-}
-
-declare namespace ns {
-    class A {
-        constructor();
-        a:string;
-        constructor(x:number);
-    }
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+class ClassExample {
+    constructor(a: 'hello');
+    constructor(a: 'bye');
+    constructor(a: string);
+    constructor(a) {
+        return a;
+    }
+}
+
+declare namespace ns {
+    class A {
+        constructor();
+        a:string;
+        constructor(x:number);
+    }
 }
\ No newline at end of file
diff --git a/es2panda/test/parser/ts/test-unary-expression-followedby-type-assertion-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test-unary-expression-followedby-type-assertion-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-unary-expression-followedby-type-assertion-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test-unary-expression-followedby-type-assertion-expected.txt
diff --git a/es2panda/test/parser/ts/test-unary-expression-followedby-type-assertion.ts b/es2panda/test/parser/ts/test_cases/type/others/test-unary-expression-followedby-type-assertion.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-unary-expression-followedby-type-assertion.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test-unary-expression-followedby-type-assertion.ts
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends1-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends1-expected.txt
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends1.ts b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends1.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends1.ts
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends2-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends2-expected.txt
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends2.ts b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends2.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends2.ts
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends3-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends3-expected.txt
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends3.ts b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends3.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends3.ts
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends4-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends4-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends4-expected.txt
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends4.ts b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends4.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends4.ts
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends5-expected.txt b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends5-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends5-expected.txt
diff --git a/es2panda/test/parser/ts/test_infer-type-with-extends5.ts b/es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_infer-type-with-extends5.ts
rename to es2panda/test/parser/ts/test_cases/type/others/test_infer-type-with-extends5.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate1-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate1-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate1.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate1.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate1.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate2-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate2-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate2.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate2.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate2.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate3-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate3-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate3.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate3.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate3.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate4-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate4-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate4-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate4.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate4.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate4.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate5-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate5-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate5-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate5.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate5.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate5.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate6-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate6-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate6-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate6.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate6.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate6.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate7-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate7-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate7-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate7.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate7.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate7.ts
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate8-expected.txt b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate8-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate8-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-type-predicate8.ts b/es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-type-predicate8.ts
rename to es2panda/test/parser/ts/test_cases/type/predicate/test-ts-type-predicate8.ts
diff --git a/es2panda/test/parser/ts/test-type-query-expected.txt b/es2panda/test/parser/ts/test_cases/type/query/test-type-query-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-query.ts b/es2panda/test/parser/ts/test_cases/type/query/test-type-query.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query.ts
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query.ts
diff --git a/es2panda/test/parser/ts/test-type-query1-expected.txt b/es2panda/test/parser/ts/test_cases/type/query/test-type-query1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query1-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-query1.ts b/es2panda/test/parser/ts/test_cases/type/query/test-type-query1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query1.ts
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query1.ts
diff --git a/es2panda/test/parser/ts/test-type-query2-expected.txt b/es2panda/test/parser/ts/test_cases/type/query/test-type-query2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query2-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-query2.ts b/es2panda/test/parser/ts/test_cases/type/query/test-type-query2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query2.ts
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query2.ts
diff --git a/es2panda/test/parser/ts/test-type-query3-expected.txt b/es2panda/test/parser/ts/test_cases/type/query/test-type-query3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query3-expected.txt
diff --git a/es2panda/test/parser/ts/test-type-query3.ts b/es2panda/test/parser/ts/test_cases/type/query/test-type-query3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-type-query3.ts
rename to es2panda/test/parser/ts/test_cases/type/query/test-type-query3.ts
diff --git a/es2panda/test/parser/ts/test-ts-symbol-type-expected.txt b/es2panda/test/parser/ts/test_cases/type/symbol/test-ts-symbol-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-symbol-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/symbol/test-ts-symbol-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-ts-symbol-type.ts b/es2panda/test/parser/ts/test_cases/type/symbol/test-ts-symbol-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-ts-symbol-type.ts
rename to es2panda/test/parser/ts/test_cases/type/symbol/test-ts-symbol-type.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type1-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type1-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type1.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type1.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type1.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type10-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type10-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type10-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type10-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type10.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type10.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type10.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type10.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type2-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type2-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type2.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type2.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type2.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type3-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type3-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type3-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type3-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type3.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type3.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type3.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type3.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type4-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type4-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type4-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type4-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type4.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type4.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type4.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type4.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type5-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type5-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type5-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type5-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type5.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type5.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type5.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type5.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type6-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type6-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type6-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type6-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type6.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type6.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type6.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type6.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type7-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type7-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type7-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type7-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type7.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type7.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type7.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type7.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type8-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type8-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type8-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type8-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type8.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type8.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type8.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type8.ts
diff --git a/es2panda/test/parser/ts/test-tuple-type9-expected.txt b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type9-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type9-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type9-expected.txt
diff --git a/es2panda/test/parser/ts/test-tuple-type9.ts b/es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type9.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-tuple-type9.ts
rename to es2panda/test/parser/ts/test_cases/type/tuple/test-tuple-type9.ts
diff --git a/es2panda/test/parser/ts/test_this_type-expected.txt b/es2panda/test/parser/ts/test_cases/type/type/test_this_type-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type-expected.txt
diff --git a/es2panda/test/parser/ts/test_this_type.ts b/es2panda/test/parser/ts/test_cases/type/type/test_this_type.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type.ts
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type.ts
diff --git a/es2panda/test/parser/ts/test_this_type1-expected.txt b/es2panda/test/parser/ts/test_cases/type/type/test_this_type1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type1-expected.txt
diff --git a/es2panda/test/parser/ts/test_this_type1.ts b/es2panda/test/parser/ts/test_cases/type/type/test_this_type1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type1.ts
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type1.ts
diff --git a/es2panda/test/parser/ts/test_this_type2-expected.txt b/es2panda/test/parser/ts/test_cases/type/type/test_this_type2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type2-expected.txt
diff --git a/es2panda/test/parser/ts/test_this_type2.ts b/es2panda/test/parser/ts/test_cases/type/type/test_this_type2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test_this_type2.ts
rename to es2panda/test/parser/ts/test_cases/type/type/test_this_type2.ts
diff --git a/es2panda/test/parser/ts/test-typeQuery1-expected.txt b/es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery1-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-typeQuery1-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery1-expected.txt
diff --git a/es2panda/test/parser/ts/test-typeQuery1.ts b/es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery1.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-typeQuery1.ts
rename to es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery1.ts
diff --git a/es2panda/test/parser/ts/test-typeQuery2-expected.txt b/es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery2-expected.txt
similarity index 100%
rename from es2panda/test/parser/ts/test-typeQuery2-expected.txt
rename to es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery2-expected.txt
diff --git a/es2panda/test/parser/ts/test-typeQuery2.ts b/es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery2.ts
similarity index 100%
rename from es2panda/test/parser/ts/test-typeQuery2.ts
rename to es2panda/test/parser/ts/test_cases/type/typeQuery/test-typeQuery2.ts
diff --git a/es2panda/test/runner.py b/es2panda/test/runner.py
index e9903b141223d07ef63707769bf5a0d66d41cd07..9aa5eb089236145158a19e071284b75e67432e7b 100755
--- a/es2panda/test/runner.py
+++ b/es2panda/test/runner.py
@@ -552,6 +552,14 @@ class RegressionRunner(Runner):
     def __init__(self, args):
         Runner.__init__(self, args, "Regression")
 
+    def add_all_test_cases_to_directory(self, directory, extension, flags):
+        start_path = path.join(self.test_root, directory)
+        for root, dirs, files in os.walk(start_path):
+            for name in dirs:
+                full_path = path.join(root, name)
+                suffix_path = full_path.replace(start_path, directory).lstrip(os.sep)
+                self.add_directory(suffix_path, extension, flags)
+
     def add_directory(self, directory, extension, flags, func=Test):
         glob_expression = path.join(
             self.test_root, directory, "*.%s" % (extension))
@@ -567,6 +575,14 @@ class AbcToAsmRunner(Runner):
     def __init__(self, args):
         Runner.__init__(self, args, "Abc2asm")
 
+    def add_all_test_cases_to_directory(self, directory, extension, flags):
+        start_path = path.join(self.test_root, directory)
+        for root, dirs, files in os.walk(start_path):
+            for name in dirs:
+                full_path = path.join(root, name)
+                suffix_path = full_path.replace(start_path, directory).lstrip(os.sep)
+                self.add_directory(suffix_path, extension, flags)
+
     def add_directory(self, directory, extension, flags, func=Test):
         glob_expression = path.join(
             self.test_root, directory, "*.%s" % (extension))
@@ -1564,11 +1580,11 @@ def main():
     if args.regression:
         runner = RegressionRunner(args)
         runner.add_directory("parser/concurrent", "js", ["--module", "--dump-ast"])
-        runner.add_directory("parser/js", "js", ["--parse-only", "--dump-ast"])
+        runner.add_all_test_cases_to_directory("parser/js/test_cases", "js", ["--parse-only", "--dump-ast"])
         runner.add_directory("parser/script", "ts", ["--parse-only", "--dump-ast"])
-        runner.add_directory("parser/ts", "ts",
+        runner.add_all_test_cases_to_directory("parser/ts/test_cases", "ts",
                              ["--parse-only", "--module", "--dump-ast"])
-        runner.add_directory("parser/ts/type_checker", "ts",
+        runner.add_all_test_cases_to_directory("parser/ts/type_checker", "ts",
                              ["--parse-only", "--enable-type-check", "--module", "--dump-ast"])
         runner.add_directory("parser/ts/cases/declaration", "d.ts",
                              ["--parse-only", "--module", "--dump-ast"], TSDeclarationTest)
@@ -1596,7 +1612,7 @@ def main():
         runner.add_directory("abc2asm/js", "js", [])
         runner.add_directory("abc2asm/ts", "ts", [])
         runner.add_directory("compiler/js", "js", [])
-        runner.add_directory("compiler/ts/cases/compiler", "ts", [])
+        runner.add_all_test_cases_to_directory("compiler/ts/cases/compiler", "ts", [])
         runner.add_directory("compiler/ts/projects", "ts", ["--module"])
         runner.add_directory("compiler/ts/projects", "ts", ["--module", "--merge-abc"])
         runner.add_directory("compiler/dts", "d.ts", ["--module", "--opt-level=0"])
@@ -1607,7 +1623,7 @@ def main():
         runner.add_directory("parser/js", "js", [])
         runner.add_directory("parser/script", "ts", [])
         runner.add_directory("parser/ts", "ts", ["--module"])
-        runner.add_directory("parser/ts/type_checker", "ts", ["--enable-type-check", "--module"])
+        runner.add_all_test_cases_to_directory("parser/ts/type_checker", "ts", ["--enable-type-check", "--module"])
         runner.add_directory("parser/commonjs", "js", ["--commonjs"])
         runner.add_directory("parser/binder", "js", [])
         runner.add_directory("parser/js/emptySource", "js", [])