From b4508b0a7ada9774694d73cc74ea73f4db09ce71 Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 21 Dec 2018 15:23:52 -0200
Subject: [PATCH] Reorganize target folders - src/dstr-binding

---
 src/dstr-binding/default/arrow-function-dflt.template           | 2 +-
 src/dstr-binding/default/arrow-function.template                | 2 +-
 src/dstr-binding/default/async-gen-func-decl-dflt.template      | 2 +-
 src/dstr-binding/default/async-gen-func-decl.template           | 2 +-
 src/dstr-binding/default/async-gen-func-expr-dflt.template      | 2 +-
 src/dstr-binding/default/async-gen-func-expr.template           | 2 +-
 .../default/async-gen-func-named-expr-dflt.template             | 2 +-
 src/dstr-binding/default/async-gen-func-named-expr.template     | 2 +-
 src/dstr-binding/default/async-gen-meth.template                | 2 +-
 src/dstr-binding/default/async-gen-method-dflt.template         | 2 +-
 src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template  | 2 +-
 .../default/cls-decl-async-gen-meth-static-dflt.template        | 2 +-
 .../default/cls-decl-async-gen-meth-static.template             | 2 +-
 src/dstr-binding/default/cls-decl-async-gen-meth.template       | 2 +-
 .../default/cls-decl-async-private-gen-meth-dflt.template       | 2 +-
 .../cls-decl-async-private-gen-meth-static-dflt.template        | 2 +-
 .../default/cls-decl-async-private-gen-meth-static.template     | 2 +-
 .../default/cls-decl-async-private-gen-meth.template            | 2 +-
 src/dstr-binding/default/cls-decl-gen-meth-dflt.template        | 2 +-
 src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template | 2 +-
 src/dstr-binding/default/cls-decl-gen-meth-static.template      | 2 +-
 src/dstr-binding/default/cls-decl-gen-meth.template             | 2 +-
 src/dstr-binding/default/cls-decl-meth-dflt.template            | 2 +-
 src/dstr-binding/default/cls-decl-meth-static-dflt.template     | 2 +-
 src/dstr-binding/default/cls-decl-meth-static.template          | 2 +-
 src/dstr-binding/default/cls-decl-meth.template                 | 2 +-
 .../default/cls-decl-private-gen-meth-dflt.template             | 2 +-
 .../default/cls-decl-private-gen-meth-static-dflt.template      | 2 +-
 .../default/cls-decl-private-gen-meth-static.template           | 2 +-
 src/dstr-binding/default/cls-decl-private-gen-meth.template     | 2 +-
 src/dstr-binding/default/cls-decl-private-meth-dflt.template    | 2 +-
 .../default/cls-decl-private-meth-static-dflt.template          | 2 +-
 src/dstr-binding/default/cls-decl-private-meth-static.template  | 2 +-
 src/dstr-binding/default/cls-decl-private-meth.template         | 2 +-
 src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template  | 2 +-
 .../default/cls-expr-async-gen-meth-static-dflt.template        | 2 +-
 .../default/cls-expr-async-gen-meth-static.template             | 2 +-
 src/dstr-binding/default/cls-expr-async-gen-meth.template       | 2 +-
 .../default/cls-expr-async-private-gen-meth-dflt.template       | 2 +-
 .../cls-expr-async-private-gen-meth-static-dflt.template        | 2 +-
 .../default/cls-expr-async-private-gen-meth-static.template     | 2 +-
 .../default/cls-expr-async-private-gen-meth.template            | 2 +-
 src/dstr-binding/default/cls-expr-gen-meth-dflt.template        | 2 +-
 src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template | 2 +-
 src/dstr-binding/default/cls-expr-gen-meth-static.template      | 2 +-
 src/dstr-binding/default/cls-expr-gen-meth.template             | 2 +-
 src/dstr-binding/default/cls-expr-meth-dflt.template            | 2 +-
 src/dstr-binding/default/cls-expr-meth-static-dflt.template     | 2 +-
 src/dstr-binding/default/cls-expr-meth-static.template          | 2 +-
 src/dstr-binding/default/cls-expr-meth.template                 | 2 +-
 .../default/cls-expr-private-gen-meth-dflt.template             | 2 +-
 .../default/cls-expr-private-gen-meth-static-dflt.template      | 2 +-
 .../default/cls-expr-private-gen-meth-static.template           | 2 +-
 src/dstr-binding/default/cls-expr-private-gen-meth.template     | 2 +-
 src/dstr-binding/default/cls-expr-private-meth-dflt.template    | 2 +-
 .../default/cls-expr-private-meth-static-dflt.template          | 2 +-
 src/dstr-binding/default/cls-expr-private-meth-static.template  | 2 +-
 src/dstr-binding/default/cls-expr-private-meth.template         | 2 +-
 src/dstr-binding/default/const-stmt.template                    | 2 +-
 src/dstr-binding/default/for-const.template                     | 2 +-
 src/dstr-binding/default/for-let.template                       | 2 +-
 src/dstr-binding/default/for-of-const.template                  | 2 +-
 src/dstr-binding/default/for-of-let.template                    | 2 +-
 src/dstr-binding/default/for-of-var.template                    | 2 +-
 src/dstr-binding/default/for-var.template                       | 2 +-
 src/dstr-binding/default/func-decl-dflt.template                | 2 +-
 src/dstr-binding/default/func-decl.template                     | 2 +-
 src/dstr-binding/default/func-expr-dflt.template                | 2 +-
 src/dstr-binding/default/func-expr.template                     | 2 +-
 src/dstr-binding/default/gen-func-decl-dflt.template            | 2 +-
 src/dstr-binding/default/gen-func-decl.template                 | 2 +-
 src/dstr-binding/default/gen-func-expr-dflt.template            | 2 +-
 src/dstr-binding/default/gen-func-expr.template                 | 2 +-
 src/dstr-binding/default/gen-meth.template                      | 2 +-
 src/dstr-binding/default/gen-method-dflt.template               | 2 +-
 src/dstr-binding/default/let-stmt.template                      | 2 +-
 src/dstr-binding/default/meth-dflt.template                     | 2 +-
 src/dstr-binding/default/meth.template                          | 2 +-
 src/dstr-binding/default/try.template                           | 2 +-
 src/dstr-binding/default/var-stmt.template                      | 2 +-
 src/dstr-binding/error/arrow-function-dflt.template             | 2 +-
 src/dstr-binding/error/arrow-function.template                  | 2 +-
 src/dstr-binding/error/async-gen-func-decl-dflt.template        | 2 +-
 src/dstr-binding/error/async-gen-func-decl.template             | 2 +-
 src/dstr-binding/error/async-gen-func-expr-dflt.template        | 2 +-
 src/dstr-binding/error/async-gen-func-expr.template             | 2 +-
 src/dstr-binding/error/async-gen-func-named-expr-dflt.template  | 2 +-
 src/dstr-binding/error/async-gen-func-named-expr.template       | 2 +-
 src/dstr-binding/error/async-gen-meth.template                  | 2 +-
 src/dstr-binding/error/async-gen-method-dflt.template           | 2 +-
 src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template    | 2 +-
 .../error/cls-decl-async-gen-meth-static-dflt.template          | 2 +-
 src/dstr-binding/error/cls-decl-async-gen-meth-static.template  | 2 +-
 src/dstr-binding/error/cls-decl-async-gen-meth.template         | 2 +-
 src/dstr-binding/error/cls-decl-gen-meth-dflt.template          | 2 +-
 src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template   | 2 +-
 src/dstr-binding/error/cls-decl-gen-meth-static.template        | 2 +-
 src/dstr-binding/error/cls-decl-gen-meth.template               | 2 +-
 src/dstr-binding/error/cls-decl-meth-dflt.template              | 2 +-
 src/dstr-binding/error/cls-decl-meth-static-dflt.template       | 2 +-
 src/dstr-binding/error/cls-decl-meth-static.template            | 2 +-
 src/dstr-binding/error/cls-decl-meth.template                   | 2 +-
 src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template    | 2 +-
 .../error/cls-expr-async-gen-meth-static-dflt.template          | 2 +-
 src/dstr-binding/error/cls-expr-async-gen-meth-static.template  | 2 +-
 src/dstr-binding/error/cls-expr-async-gen-meth.template         | 2 +-
 src/dstr-binding/error/cls-expr-gen-meth-dflt.template          | 2 +-
 src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template   | 2 +-
 src/dstr-binding/error/cls-expr-gen-meth-static.template        | 2 +-
 src/dstr-binding/error/cls-expr-gen-meth.template               | 2 +-
 src/dstr-binding/error/cls-expr-meth-dflt.template              | 2 +-
 src/dstr-binding/error/cls-expr-meth-static-dflt.template       | 2 +-
 src/dstr-binding/error/cls-expr-meth-static.template            | 2 +-
 src/dstr-binding/error/cls-expr-meth.template                   | 2 +-
 src/dstr-binding/error/const-stmt.template                      | 2 +-
 src/dstr-binding/error/for-const.template                       | 2 +-
 src/dstr-binding/error/for-let.template                         | 2 +-
 src/dstr-binding/error/for-of-const.template                    | 2 +-
 src/dstr-binding/error/for-of-let.template                      | 2 +-
 src/dstr-binding/error/for-of-var.template                      | 2 +-
 src/dstr-binding/error/for-var.template                         | 2 +-
 src/dstr-binding/error/func-decl-dflt.template                  | 2 +-
 src/dstr-binding/error/func-decl.template                       | 2 +-
 src/dstr-binding/error/func-expr-dflt.template                  | 2 +-
 src/dstr-binding/error/func-expr.template                       | 2 +-
 src/dstr-binding/error/gen-func-decl-dflt.template              | 2 +-
 src/dstr-binding/error/gen-func-decl.template                   | 2 +-
 src/dstr-binding/error/gen-func-expr-dflt.template              | 2 +-
 src/dstr-binding/error/gen-func-expr.template                   | 2 +-
 src/dstr-binding/error/gen-meth-dflt.template                   | 2 +-
 src/dstr-binding/error/gen-meth.template                        | 2 +-
 src/dstr-binding/error/let-stmt.template                        | 2 +-
 src/dstr-binding/error/meth-dflt.template                       | 2 +-
 src/dstr-binding/error/meth.template                            | 2 +-
 src/dstr-binding/error/try.template                             | 2 +-
 src/dstr-binding/error/var-stmt.template                        | 2 +-
 src/dstr-binding/iter-close/for-const.template                  | 2 +-
 src/dstr-binding/iter-close/for-let.template                    | 2 +-
 src/dstr-binding/iter-close/for-of-const.template               | 2 +-
 src/dstr-binding/iter-close/for-of-let.template                 | 2 +-
 src/dstr-binding/iter-close/for-of-var.template                 | 2 +-
 src/dstr-binding/iter-close/for-var.template                    | 2 +-
 142 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/src/dstr-binding/default/arrow-function-dflt.template b/src/dstr-binding/default/arrow-function-dflt.template
index b6e0eabd9b..c38fe9a0e7 100644
--- a/src/dstr-binding/default/arrow-function-dflt.template
+++ b/src/dstr-binding/default/arrow-function-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/dstr-dflt-
+path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/default/arrow-function.template b/src/dstr-binding/default/arrow-function.template
index 85969d4cbd..e9365deef6 100644
--- a/src/dstr-binding/default/arrow-function.template
+++ b/src/dstr-binding/default/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/dstr-
+path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/default/async-gen-func-decl-dflt.template b/src/dstr-binding/default/async-gen-func-decl-dflt.template
index 1f7045cd81..22f6634ece 100644
--- a/src/dstr-binding/default/async-gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-decl-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-dflt-
+path: language/statements/async-generator/dstr/dflt-
 name: async generator function declaration (default parameter)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-decl.template b/src/dstr-binding/default/async-gen-func-decl.template
index 0eeb3eae20..524636c775 100644
--- a/src/dstr-binding/default/async-gen-func-decl.template
+++ b/src/dstr-binding/default/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-
+path: language/statements/async-generator/dstr/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-expr-dflt.template b/src/dstr-binding/default/async-gen-func-expr-dflt.template
index c514a6aa96..af7f8b9b06 100644
--- a/src/dstr-binding/default/async-gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-dflt-
+path: language/expressions/async-generator/dstr/dflt-
 name: async generator function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-expr.template b/src/dstr-binding/default/async-gen-func-expr.template
index 09e743cba2..9f2e339a7a 100644
--- a/src/dstr-binding/default/async-gen-func-expr.template
+++ b/src/dstr-binding/default/async-gen-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-
+path: language/expressions/async-generator/dstr/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-named-expr-dflt.template b/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
index fb3dbaf1f5..5e3d980f4b 100644
--- a/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-dflt-
+path: language/expressions/async-generator/dstr/named-dflt-
 name: async generator named function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-named-expr.template b/src/dstr-binding/default/async-gen-func-named-expr.template
index f96bba4096..f69b7d6e84 100644
--- a/src/dstr-binding/default/async-gen-func-named-expr.template
+++ b/src/dstr-binding/default/async-gen-func-named-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-
+path: language/expressions/async-generator/dstr/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-meth.template b/src/dstr-binding/default/async-gen-meth.template
index 71142977d8..3188c7d6c5 100644
--- a/src/dstr-binding/default/async-gen-meth.template
+++ b/src/dstr-binding/default/async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-
+path: language/expressions/object/dstr/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-method-dflt.template b/src/dstr-binding/default/async-gen-method-dflt.template
index c0c98a853e..6b9a7f2083 100644
--- a/src/dstr-binding/default/async-gen-method-dflt.template
+++ b/src/dstr-binding/default/async-gen-method-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-dflt-
+path: language/expressions/object/dstr/async-gen-meth-dflt-
 name: async generator method (default parameter)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
index ab50758df8..1cd5617750 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-dflt-
+path: language/statements/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
index 2fc323229d..7ea8aa2a79 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-static.template b/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
index 8586b9227c..c8156d48d3 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-
+path: language/statements/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth.template b/src/dstr-binding/default/cls-decl-async-gen-meth.template
index 8ca3de418a..f55f6b686d 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-
+path: language/statements/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
index 3d3bbfaaf6..d976c15366 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-dflt-
+path: language/statements/class/dstr/async-private-gen-meth-dflt-
 name: private class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
index dd431d635d..5fef0ef111 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-private-gen-meth-static-dflt-
 name: private static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
index 39f44b4a43..1a90beaaf1 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-static-
+path: language/statements/class/dstr/async-private-gen-meth-static-
 name: private static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
index 6072ee707b..fc698e674b 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-
+path: language/statements/class/dstr/async-private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
index c486163c4c..5ccfc2e578 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-dflt-
+path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
index 2541351951..655c47ba39 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-static-dflt-
+path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static.template b/src/dstr-binding/default/cls-decl-gen-meth-static.template
index 150c19e2a9..570b70bbd0 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-static-
+path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-gen-meth.template b/src/dstr-binding/default/cls-decl-gen-meth.template
index 2df18311d5..41f7fbc639 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-
+path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-decl-meth-dflt.template b/src/dstr-binding/default/cls-decl-meth-dflt.template
index 9a073c5b74..6a3139a96e 100644
--- a/src/dstr-binding/default/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-dflt-
+path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-meth-static-dflt.template
index 07f25960ab..f19012837d 100644
--- a/src/dstr-binding/default/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-static-dflt-
+path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth-static.template b/src/dstr-binding/default/cls-decl-meth-static.template
index 40197a50f0..3814c1aee1 100644
--- a/src/dstr-binding/default/cls-decl-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-static-
+path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth.template b/src/dstr-binding/default/cls-decl-meth.template
index 29fdbcffea..ee4384f25d 100644
--- a/src/dstr-binding/default/cls-decl-meth.template
+++ b/src/dstr-binding/default/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-
+path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
index 48914f6caf..d99ed07d41 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-dflt-
+path: language/statements/class/dstr/private-gen-meth-dflt-
 name: private class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
index 667c0abc4a..c7f21f468e 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-static-dflt-
+path: language/statements/class/dstr/private-gen-meth-static-dflt-
 name: private static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-static.template b/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
index 0768037c06..16fc11316c 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-static-
+path: language/statements/class/dstr/private-gen-meth-static-
 name: private static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth.template b/src/dstr-binding/default/cls-decl-private-gen-meth.template
index e4b3a1f1ad..1ca444260e 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-
+path: language/statements/class/dstr/private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-dflt.template b/src/dstr-binding/default/cls-decl-private-meth-dflt.template
index b69eb1f708..7ce3b32c7c 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-dflt-
+path: language/statements/class/dstr/private-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
index 380d0c6bac..93c25dcca3 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-static-dflt-
+path: language/statements/class/dstr/private-meth-static-dflt-
 name: private static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-static.template b/src/dstr-binding/default/cls-decl-private-meth-static.template
index bcf1dfd3d1..7404703e68 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-static-
+path: language/statements/class/dstr/private-meth-static-
 name: private static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-meth.template b/src/dstr-binding/default/cls-decl-private-meth.template
index fd44964fbc..db7dda7a37 100644
--- a/src/dstr-binding/default/cls-decl-private-meth.template
+++ b/src/dstr-binding/default/cls-decl-private-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-
+path: language/statements/class/dstr/private-meth-
 name: private class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
index 4e0acac1ed..effe6ada36 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-dflt-
+path: language/expressions/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
index 3dbcf59e2a..5752db2e89 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-static.template b/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
index 003cd8cb35..228334a2cd 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-
+path: language/expressions/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth.template b/src/dstr-binding/default/cls-expr-async-gen-meth.template
index 5ef3e6228e..f2ef576d17 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-
+path: language/expressions/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
index 1b9fbb0d63..5aebd9dda6 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-dflt-
+path: language/expressions/class/dstr/async-private-gen-meth-dflt-
 name: private class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
index 87d74e5138..c61f3f093c 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-private-gen-meth-static-dflt-
 name: private static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
index 66c01f3c29..08863dfd97 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-static-
+path: language/expressions/class/dstr/async-private-gen-meth-static-
 name: private static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
index 89aec57a6a..36df2dcc5c 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-
+path: language/expressions/class/dstr/async-private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
index 29d90bd76e..037fb1da27 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-dflt-
+path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
index 652189ce24..09071348a3 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-static-dflt-
+path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static.template b/src/dstr-binding/default/cls-expr-gen-meth-static.template
index 9bcb541a3b..9992266834 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-static-
+path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth.template b/src/dstr-binding/default/cls-expr-gen-meth.template
index 1f1e47904f..06faa0450b 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-
+path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-dflt.template b/src/dstr-binding/default/cls-expr-meth-dflt.template
index c2a5f0e4ad..94636d4603 100644
--- a/src/dstr-binding/default/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-dflt-
+path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-meth-static-dflt.template
index 831d74e41a..55b947ee9b 100644
--- a/src/dstr-binding/default/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-static-dflt-
+path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-static.template b/src/dstr-binding/default/cls-expr-meth-static.template
index d8e8b9841a..7413426a03 100644
--- a/src/dstr-binding/default/cls-expr-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-static-
+path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth.template b/src/dstr-binding/default/cls-expr-meth.template
index fd9b1075d4..355cb82fd6 100644
--- a/src/dstr-binding/default/cls-expr-meth.template
+++ b/src/dstr-binding/default/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-
+path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
index e0657f8fc2..e656f2f009 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-dflt-
+path: language/expressions/class/dstr/private-gen-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
index 3a8c8dabcf..f5229ac91d 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-static-dflt-
+path: language/expressions/class/dstr/private-gen-meth-static-dflt-
 name: private static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-static.template b/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
index 971b5fe726..7df96902cd 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-static-
+path: language/expressions/class/dstr/private-gen-meth-static-
 name: private static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth.template b/src/dstr-binding/default/cls-expr-private-gen-meth.template
index fa1343f423..3a935ef924 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-
+path: language/expressions/class/dstr/private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-dflt.template b/src/dstr-binding/default/cls-expr-private-meth-dflt.template
index 9be9a76255..0a453ea7f2 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-dflt-
+path: language/expressions/class/dstr/private-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
index af8fb29214..6f04e8c48b 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-static-dflt-
+path: language/expressions/class/dstr/private-meth-static-dflt-
 name: private static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-static.template b/src/dstr-binding/default/cls-expr-private-meth-static.template
index ccaec8e202..a7a57e9c8f 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-static-
+path: language/expressions/class/dstr/private-meth-static-
 name: private static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-meth.template b/src/dstr-binding/default/cls-expr-private-meth.template
index 065c11441f..4679b00b9c 100644
--- a/src/dstr-binding/default/cls-expr-private-meth.template
+++ b/src/dstr-binding/default/cls-expr-private-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-
+path: language/expressions/class/dstr/private-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/const-stmt.template b/src/dstr-binding/default/const-stmt.template
index d3d75575c9..0ee88b6cf5 100644
--- a/src/dstr-binding/default/const-stmt.template
+++ b/src/dstr-binding/default/const-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/const/dstr-
+path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/default/for-const.template b/src/dstr-binding/default/for-const.template
index cc89ba30d4..32c1ae7561 100644
--- a/src/dstr-binding/default/for-const.template
+++ b/src/dstr-binding/default/for-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/for-let.template b/src/dstr-binding/default/for-let.template
index d904941088..87260f26b6 100644
--- a/src/dstr-binding/default/for-let.template
+++ b/src/dstr-binding/default/for-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/for-of-const.template b/src/dstr-binding/default/for-of-const.template
index c84dfa74a3..103f4435c8 100644
--- a/src/dstr-binding/default/for-of-const.template
+++ b/src/dstr-binding/default/for-of-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-of-let.template b/src/dstr-binding/default/for-of-let.template
index c4366ad2c0..65137c6f74 100644
--- a/src/dstr-binding/default/for-of-let.template
+++ b/src/dstr-binding/default/for-of-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-of-var.template b/src/dstr-binding/default/for-of-var.template
index 53feb6f438..09929fd013 100644
--- a/src/dstr-binding/default/for-of-var.template
+++ b/src/dstr-binding/default/for-of-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-var.template b/src/dstr-binding/default/for-var.template
index e2122ecd70..66dbf194ca 100644
--- a/src/dstr-binding/default/for-var.template
+++ b/src/dstr-binding/default/for-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/func-decl-dflt.template b/src/dstr-binding/default/func-decl-dflt.template
index 9b58d5a198..9543ca1c08 100644
--- a/src/dstr-binding/default/func-decl-dflt.template
+++ b/src/dstr-binding/default/func-decl-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/dstr-dflt-
+path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/default/func-decl.template b/src/dstr-binding/default/func-decl.template
index 9565daf6cf..f45aad790c 100644
--- a/src/dstr-binding/default/func-decl.template
+++ b/src/dstr-binding/default/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/dstr-
+path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/default/func-expr-dflt.template b/src/dstr-binding/default/func-expr-dflt.template
index bee2b4aa22..2f2a9237ba 100644
--- a/src/dstr-binding/default/func-expr-dflt.template
+++ b/src/dstr-binding/default/func-expr-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/dstr-dflt-
+path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/default/func-expr.template b/src/dstr-binding/default/func-expr.template
index a48fb7c4c7..b29195dc5a 100644
--- a/src/dstr-binding/default/func-expr.template
+++ b/src/dstr-binding/default/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/dstr-
+path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/default/gen-func-decl-dflt.template b/src/dstr-binding/default/gen-func-decl-dflt.template
index 52f8d9cb58..34a3f0d8b9 100644
--- a/src/dstr-binding/default/gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/gen-func-decl-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/dstr-dflt-
+path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/default/gen-func-decl.template b/src/dstr-binding/default/gen-func-decl.template
index 68f176115f..23d1b876c9 100644
--- a/src/dstr-binding/default/gen-func-decl.template
+++ b/src/dstr-binding/default/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/dstr-
+path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/default/gen-func-expr-dflt.template b/src/dstr-binding/default/gen-func-expr-dflt.template
index 87ed77993a..5e2d0b926d 100644
--- a/src/dstr-binding/default/gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/gen-func-expr-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/dstr-dflt-
+path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/default/gen-func-expr.template b/src/dstr-binding/default/gen-func-expr.template
index bbcea8cc02..74d2caadaf 100644
--- a/src/dstr-binding/default/gen-func-expr.template
+++ b/src/dstr-binding/default/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/dstr-
+path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/default/gen-meth.template b/src/dstr-binding/default/gen-meth.template
index 50bf051055..0c4fc28aad 100644
--- a/src/dstr-binding/default/gen-meth.template
+++ b/src/dstr-binding/default/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-gen-meth-
+path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/default/gen-method-dflt.template b/src/dstr-binding/default/gen-method-dflt.template
index 59aa756e31..d51f4cc552 100644
--- a/src/dstr-binding/default/gen-method-dflt.template
+++ b/src/dstr-binding/default/gen-method-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-gen-meth-dflt-
+path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/default/let-stmt.template b/src/dstr-binding/default/let-stmt.template
index 953a998698..3569d17c2e 100644
--- a/src/dstr-binding/default/let-stmt.template
+++ b/src/dstr-binding/default/let-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/let/dstr-
+path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/default/meth-dflt.template b/src/dstr-binding/default/meth-dflt.template
index 3a8b825e7e..bc77ee0e1b 100644
--- a/src/dstr-binding/default/meth-dflt.template
+++ b/src/dstr-binding/default/meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-meth-dflt-
+path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/default/meth.template b/src/dstr-binding/default/meth.template
index 675a81770f..77376c53a5 100644
--- a/src/dstr-binding/default/meth.template
+++ b/src/dstr-binding/default/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-meth-
+path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/default/try.template b/src/dstr-binding/default/try.template
index da603c64b6..fb1881b68e 100644
--- a/src/dstr-binding/default/try.template
+++ b/src/dstr-binding/default/try.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/try/dstr-
+path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
 es6id: 13.15.7
diff --git a/src/dstr-binding/default/var-stmt.template b/src/dstr-binding/default/var-stmt.template
index 23c94ba595..5650469c3e 100644
--- a/src/dstr-binding/default/var-stmt.template
+++ b/src/dstr-binding/default/var-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/variable/dstr-
+path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/arrow-function-dflt.template b/src/dstr-binding/error/arrow-function-dflt.template
index 268fbe58b8..7cbabac815 100644
--- a/src/dstr-binding/error/arrow-function-dflt.template
+++ b/src/dstr-binding/error/arrow-function-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/dstr-dflt-
+path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/error/arrow-function.template b/src/dstr-binding/error/arrow-function.template
index 92b1a41c45..407ad12300 100644
--- a/src/dstr-binding/error/arrow-function.template
+++ b/src/dstr-binding/error/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/dstr-
+path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/error/async-gen-func-decl-dflt.template b/src/dstr-binding/error/async-gen-func-decl-dflt.template
index 73788c2574..3395da2e25 100644
--- a/src/dstr-binding/error/async-gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-decl-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-dflt-
+path: language/statements/async-generator/dstr/dflt-
 name: async generator function declaration (default parameter)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-decl.template b/src/dstr-binding/error/async-gen-func-decl.template
index 50e3ca2c77..8da6f7d36c 100644
--- a/src/dstr-binding/error/async-gen-func-decl.template
+++ b/src/dstr-binding/error/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-
+path: language/statements/async-generator/dstr/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-expr-dflt.template b/src/dstr-binding/error/async-gen-func-expr-dflt.template
index c7c9d3457c..fb9045ddb8 100644
--- a/src/dstr-binding/error/async-gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-dflt-
+path: language/expressions/async-generator/dstr/dflt-
 name: async generator function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-expr.template b/src/dstr-binding/error/async-gen-func-expr.template
index 8da6fd8cde..a52354682b 100644
--- a/src/dstr-binding/error/async-gen-func-expr.template
+++ b/src/dstr-binding/error/async-gen-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-
+path: language/expressions/async-generator/dstr/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-named-expr-dflt.template b/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
index d75f5e7197..b6731c1daa 100644
--- a/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-dflt-
+path: language/expressions/async-generator/dstr/named-dflt-
 name: async generator named function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-named-expr.template b/src/dstr-binding/error/async-gen-func-named-expr.template
index cf9176ff24..cd659836cf 100644
--- a/src/dstr-binding/error/async-gen-func-named-expr.template
+++ b/src/dstr-binding/error/async-gen-func-named-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-
+path: language/expressions/async-generator/dstr/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-meth.template b/src/dstr-binding/error/async-gen-meth.template
index a98c034f7a..7c0763d4d0 100644
--- a/src/dstr-binding/error/async-gen-meth.template
+++ b/src/dstr-binding/error/async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-
+path: language/expressions/object/dstr/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-method-dflt.template b/src/dstr-binding/error/async-gen-method-dflt.template
index fd787e49c5..9a3948f17d 100644
--- a/src/dstr-binding/error/async-gen-method-dflt.template
+++ b/src/dstr-binding/error/async-gen-method-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-dflt-
+path: language/expressions/object/dstr/async-gen-meth-dflt-
 name: async generator method (default parameter)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
index 4a2bcc6aa3..542695776b 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-dflt-
+path: language/statements/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
index 1794cd64e7..c3367a665a 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-static.template b/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
index 98038e374a..718d09b347 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-
+path: language/statements/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth.template b/src/dstr-binding/error/cls-decl-async-gen-meth.template
index 25745f17c3..277dde2aed 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-
+path: language/statements/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
index 4f51d6a21c..b35bedb50d 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-dflt-
+path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
index d722764253..88b8065b10 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-static-dflt-
+path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static.template b/src/dstr-binding/error/cls-decl-gen-meth-static.template
index 7785f7ec7d..7f3a2399f8 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-static-
+path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-gen-meth.template b/src/dstr-binding/error/cls-decl-gen-meth.template
index f313d1c0ec..2ebbcb7b91 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-gen-meth-
+path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-decl-meth-dflt.template b/src/dstr-binding/error/cls-decl-meth-dflt.template
index 6824a0a039..9175802c68 100644
--- a/src/dstr-binding/error/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-dflt-
+path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-meth-static-dflt.template
index 7c86010dbf..228ef40527 100644
--- a/src/dstr-binding/error/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-static-dflt-
+path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth-static.template b/src/dstr-binding/error/cls-decl-meth-static.template
index d299bd0f05..8cbf39a94c 100644
--- a/src/dstr-binding/error/cls-decl-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-static-
+path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth.template b/src/dstr-binding/error/cls-decl-meth.template
index e1738089d2..96ac5d49b9 100644
--- a/src/dstr-binding/error/cls-decl-meth.template
+++ b/src/dstr-binding/error/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-meth-
+path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
index 05f0c41e20..0f1345c16f 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-dflt-
+path: language/expressions/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
index 37fc8cb668..8b1ab24cf3 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-static.template b/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
index 0830cf4470..02ef79d211 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-
+path: language/expressions/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth.template b/src/dstr-binding/error/cls-expr-async-gen-meth.template
index 0e7433a4d7..749d1c8810 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-
+path: language/expressions/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
index 9595e42c9e..2b3a806fcc 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-dflt-
+path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
index 6a4aaec82c..a7046384a0 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-static-dflt-
+path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static.template b/src/dstr-binding/error/cls-expr-gen-meth-static.template
index a1304926ca..74f572754d 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-static-
+path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth.template b/src/dstr-binding/error/cls-expr-gen-meth.template
index c173439067..47e8b370fa 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-gen-meth-
+path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-dflt.template b/src/dstr-binding/error/cls-expr-meth-dflt.template
index 0f1465a2b1..d3ebdab173 100644
--- a/src/dstr-binding/error/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-dflt-
+path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-meth-static-dflt.template
index e623115df5..d5aa14738e 100644
--- a/src/dstr-binding/error/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-static-dflt-
+path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-static.template b/src/dstr-binding/error/cls-expr-meth-static.template
index ce97598e6a..296d65ff38 100644
--- a/src/dstr-binding/error/cls-expr-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-static-
+path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth.template b/src/dstr-binding/error/cls-expr-meth.template
index ff07a66968..494cec232f 100644
--- a/src/dstr-binding/error/cls-expr-meth.template
+++ b/src/dstr-binding/error/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-meth-
+path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/const-stmt.template b/src/dstr-binding/error/const-stmt.template
index 4016210c2d..19fe7ede2c 100644
--- a/src/dstr-binding/error/const-stmt.template
+++ b/src/dstr-binding/error/const-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/const/dstr-
+path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/for-const.template b/src/dstr-binding/error/for-const.template
index c3e47fe797..2990bc8850 100644
--- a/src/dstr-binding/error/for-const.template
+++ b/src/dstr-binding/error/for-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/for-let.template b/src/dstr-binding/error/for-let.template
index 8efd2feaad..237a248413 100644
--- a/src/dstr-binding/error/for-let.template
+++ b/src/dstr-binding/error/for-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/for-of-const.template b/src/dstr-binding/error/for-of-const.template
index 4b3bcbd529..0bc9bbb64b 100644
--- a/src/dstr-binding/error/for-of-const.template
+++ b/src/dstr-binding/error/for-of-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-of-let.template b/src/dstr-binding/error/for-of-let.template
index 73f3e2175b..37109515bb 100644
--- a/src/dstr-binding/error/for-of-let.template
+++ b/src/dstr-binding/error/for-of-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-of-var.template b/src/dstr-binding/error/for-of-var.template
index a16c42556c..7bc1bba89e 100644
--- a/src/dstr-binding/error/for-of-var.template
+++ b/src/dstr-binding/error/for-of-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-var.template b/src/dstr-binding/error/for-var.template
index 7780e112ab..9b7eec2ab1 100644
--- a/src/dstr-binding/error/for-var.template
+++ b/src/dstr-binding/error/for-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/func-decl-dflt.template b/src/dstr-binding/error/func-decl-dflt.template
index ebadbe395e..f0fada3da2 100644
--- a/src/dstr-binding/error/func-decl-dflt.template
+++ b/src/dstr-binding/error/func-decl-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/dstr-dflt-
+path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/error/func-decl.template b/src/dstr-binding/error/func-decl.template
index 13dff27199..103f714343 100644
--- a/src/dstr-binding/error/func-decl.template
+++ b/src/dstr-binding/error/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/dstr-
+path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/error/func-expr-dflt.template b/src/dstr-binding/error/func-expr-dflt.template
index 29c03f558e..06546ee61b 100644
--- a/src/dstr-binding/error/func-expr-dflt.template
+++ b/src/dstr-binding/error/func-expr-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/dstr-dflt-
+path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/error/func-expr.template b/src/dstr-binding/error/func-expr.template
index 4ee783d950..aafedd0e6a 100644
--- a/src/dstr-binding/error/func-expr.template
+++ b/src/dstr-binding/error/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/dstr-
+path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/error/gen-func-decl-dflt.template b/src/dstr-binding/error/gen-func-decl-dflt.template
index f88a13f08c..24ad152a9a 100644
--- a/src/dstr-binding/error/gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/gen-func-decl-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/dstr-dflt-
+path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/error/gen-func-decl.template b/src/dstr-binding/error/gen-func-decl.template
index 1a507ccd78..b3058a7578 100644
--- a/src/dstr-binding/error/gen-func-decl.template
+++ b/src/dstr-binding/error/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/dstr-
+path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/error/gen-func-expr-dflt.template b/src/dstr-binding/error/gen-func-expr-dflt.template
index e45f94ec9d..982b6e417f 100644
--- a/src/dstr-binding/error/gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/gen-func-expr-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/dstr-dflt-
+path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/error/gen-func-expr.template b/src/dstr-binding/error/gen-func-expr.template
index 7554ef722e..de951c4a3e 100644
--- a/src/dstr-binding/error/gen-func-expr.template
+++ b/src/dstr-binding/error/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/dstr-
+path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/error/gen-meth-dflt.template b/src/dstr-binding/error/gen-meth-dflt.template
index 24e7aa2bc0..178174ebb0 100644
--- a/src/dstr-binding/error/gen-meth-dflt.template
+++ b/src/dstr-binding/error/gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-gen-meth-dflt-
+path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/error/gen-meth.template b/src/dstr-binding/error/gen-meth.template
index 821d08a2d9..2e4c09aa4f 100644
--- a/src/dstr-binding/error/gen-meth.template
+++ b/src/dstr-binding/error/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-gen-meth-
+path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/error/let-stmt.template b/src/dstr-binding/error/let-stmt.template
index 66ba68be67..dbef6eca07 100644
--- a/src/dstr-binding/error/let-stmt.template
+++ b/src/dstr-binding/error/let-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/let/dstr-
+path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/meth-dflt.template b/src/dstr-binding/error/meth-dflt.template
index e56ffd0b2c..b1faa121ec 100644
--- a/src/dstr-binding/error/meth-dflt.template
+++ b/src/dstr-binding/error/meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-meth-dflt-
+path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/error/meth.template b/src/dstr-binding/error/meth.template
index b0fdecc58d..f0f26bbb63 100644
--- a/src/dstr-binding/error/meth.template
+++ b/src/dstr-binding/error/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/dstr-meth-
+path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/error/try.template b/src/dstr-binding/error/try.template
index a7a83647ca..611365d567 100644
--- a/src/dstr-binding/error/try.template
+++ b/src/dstr-binding/error/try.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/try/dstr-
+path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
 es6id: 13.15.7
diff --git a/src/dstr-binding/error/var-stmt.template b/src/dstr-binding/error/var-stmt.template
index f3adc65f60..0a1b9b72a7 100644
--- a/src/dstr-binding/error/var-stmt.template
+++ b/src/dstr-binding/error/var-stmt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/variable/dstr-
+path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-binding/iter-close/for-const.template b/src/dstr-binding/iter-close/for-const.template
index bcd66ebf18..1ad33ac052 100644
--- a/src/dstr-binding/iter-close/for-const.template
+++ b/src/dstr-binding/iter-close/for-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/iter-close/for-let.template b/src/dstr-binding/iter-close/for-let.template
index 1dd2ea3d68..185a814481 100644
--- a/src/dstr-binding/iter-close/for-let.template
+++ b/src/dstr-binding/iter-close/for-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/iter-close/for-of-const.template b/src/dstr-binding/iter-close/for-of-const.template
index 15fc0d18ce..fd0ece582c 100644
--- a/src/dstr-binding/iter-close/for-of-const.template
+++ b/src/dstr-binding/iter-close/for-of-const.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-of-let.template b/src/dstr-binding/iter-close/for-of-let.template
index c0b49b7dc5..393b7ed548 100644
--- a/src/dstr-binding/iter-close/for-of-let.template
+++ b/src/dstr-binding/iter-close/for-of-let.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-of-var.template b/src/dstr-binding/iter-close/for-of-var.template
index d945561a2e..0cabbb93b4 100644
--- a/src/dstr-binding/iter-close/for-of-var.template
+++ b/src/dstr-binding/iter-close/for-of-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-var.template b/src/dstr-binding/iter-close/for-var.template
index 8dce099d1d..62fabb5d33 100644
--- a/src/dstr-binding/iter-close/for-var.template
+++ b/src/dstr-binding/iter-close/for-var.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
-- 
GitLab