diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.symbols b/tests/baselines/reference/superCallBeforeThisAccessing1.symbols
index b30d46c5b30..5a153728a73 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.symbols
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.symbols
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing1.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts ===
 declare var Factory: any
 >Factory : Symbol(Factory, Decl(superCallBeforeThisAccessing1.ts, 0, 11))
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.types b/tests/baselines/reference/superCallBeforeThisAccessing1.types
index 641d49efdda..e947653584a 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.types
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing1.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts ===
 declare var Factory: any
 >Factory : any
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.symbols b/tests/baselines/reference/superCallBeforeThisAccessing2.symbols
index 9e0e11dd2ac..2df2e62354a 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.symbols
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.symbols
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing2.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts ===
 class Base {
 >Base : Symbol(Base, Decl(superCallBeforeThisAccessing2.ts, 0, 0))
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.types b/tests/baselines/reference/superCallBeforeThisAccessing2.types
index e6307a977da..cf0f54b6246 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.types
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing2.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts ===
 class Base {
 >Base : Base
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt
index 526c43d735c..90b9b034263 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/classes/superCallBeforeThisAccessing3.ts(9,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts(9,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
 
-==== tests/cases/conformance/classes/superCallBeforeThisAccessing3.ts (1 errors) ====
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts (1 errors) ====
     class Base {
         constructor(c) { }
     }
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt
index d3211eca14f..ca419b30858 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/classes/superCallBeforeThisAccessing4.ts(3,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
-tests/cases/conformance/classes/superCallBeforeThisAccessing4.ts(11,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts(3,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts(11,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
 
 
-==== tests/cases/conformance/classes/superCallBeforeThisAccessing4.ts (2 errors) ====
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts (2 errors) ====
     class D extends null {
         private _t;
         constructor() {
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.symbols b/tests/baselines/reference/superCallBeforeThisAccessing5.symbols
index 002d6e1ff77..a7628e3b8df 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.symbols
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.symbols
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing5.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts ===
 class D extends null {
 >D : Symbol(D, Decl(superCallBeforeThisAccessing5.ts, 0, 0))
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.types b/tests/baselines/reference/superCallBeforeThisAccessing5.types
index 543e453ffe3..2c0fc33c4dc 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.types
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing5.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts ===
 class D extends null {
 >D : D
 >null : null
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt
index 534b3605fc9..346b2d58bec 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/classes/superCallBeforeThisAccessing6.ts(7,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts(7,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
 
-==== tests/cases/conformance/classes/superCallBeforeThisAccessing6.ts (1 errors) ====
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts (1 errors) ====
     class Base {
         constructor(c) { }
     }
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt
index 73997db3b25..4e374fd96ea 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/classes/superCallBeforeThisAccessing7.ts(8,16): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts(8,16): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
 
-==== tests/cases/conformance/classes/superCallBeforeThisAccessing7.ts (1 errors) ====
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts (1 errors) ====
     class Base {
         constructor(c) { }
     }
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.symbols b/tests/baselines/reference/superCallBeforeThisAccessing8.symbols
index e29284be43b..65341ee9fe3 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.symbols
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.symbols
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing8.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts ===
 class Base {
 >Base : Symbol(Base, Decl(superCallBeforeThisAccessing8.ts, 0, 0))
 
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.types b/tests/baselines/reference/superCallBeforeThisAccessing8.types
index 7378a1fed23..dd92d924ceb 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.types
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/superCallBeforeThisAccessing8.ts ===
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts ===
 class Base {
 >Base : Base
 
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing1.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing1.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing2.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing2.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing3.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing3.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing4.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing4.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing5.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing5.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing6.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing6.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing7.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing7.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts
diff --git a/tests/cases/conformance/classes/superCallBeforeThisAccessing8.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts
similarity index 100%
rename from tests/cases/conformance/classes/superCallBeforeThisAccessing8.ts
rename to tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts