From 5c625a615ff30876d409915bee17d6e4115f211b Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 19 Oct 2018 11:49:38 -0400
Subject: [PATCH] Set test generation of dynamic-import to aim the correct
 folder

---
 src/dynamic-import/catch/nested-arrow.template                  | 2 +-
 src/dynamic-import/catch/nested-async-arrow-fn-await.template   | 2 +-
 .../catch/nested-async-arrow-fn-return-await.template           | 2 +-
 src/dynamic-import/catch/nested-async-function-await.template   | 2 +-
 .../catch/nested-async-function-return-await.template           | 2 +-
 src/dynamic-import/catch/nested-async-function.template         | 2 +-
 src/dynamic-import/catch/nested-async-generator-await.template  | 2 +-
 .../catch/nested-async-generator-return-await.template          | 2 +-
 src/dynamic-import/catch/nested-block-labeled.template          | 2 +-
 src/dynamic-import/catch/nested-block.template                  | 2 +-
 src/dynamic-import/catch/nested-do-while.template               | 2 +-
 src/dynamic-import/catch/nested-else.template                   | 2 +-
 src/dynamic-import/catch/nested-function.template               | 2 +-
 src/dynamic-import/catch/nested-if.template                     | 2 +-
 src/dynamic-import/catch/nested-while.template                  | 2 +-
 src/dynamic-import/catch/top-level.template                     | 2 +-
 src/dynamic-import/default/nested-arrow-assign-expr.template    | 2 +-
 src/dynamic-import/default/nested-arrow.template                | 2 +-
 src/dynamic-import/default/nested-async-arrow-fn-await.template | 2 +-
 .../default/nested-async-arrow-fn-return-await.template         | 2 +-
 src/dynamic-import/default/nested-async-function-await.template | 2 +-
 .../default/nested-async-function-return-await.template         | 2 +-
 src/dynamic-import/default/nested-async-function.template       | 2 +-
 .../default/nested-async-generator-await.template               | 2 +-
 .../default/nested-async-generator-return-await.template        | 2 +-
 src/dynamic-import/default/nested-block-labeled.template        | 2 +-
 src/dynamic-import/default/nested-block.template                | 2 +-
 src/dynamic-import/default/nested-do-while.template             | 2 +-
 src/dynamic-import/default/nested-else.template                 | 2 +-
 src/dynamic-import/default/nested-function.template             | 2 +-
 src/dynamic-import/default/nested-if-braceless.template         | 2 +-
 src/dynamic-import/default/nested-if.template                   | 2 +-
 src/dynamic-import/default/nested-while.template                | 2 +-
 src/dynamic-import/default/top-level.template                   | 2 +-
 src/dynamic-import/namespace/await.template                     | 2 +-
 src/dynamic-import/namespace/promise.template                   | 2 +-
 .../syntax/invalid/nested-arrow-assignment-expression.template  | 2 +-
 src/dynamic-import/syntax/invalid/nested-arrow.template         | 2 +-
 .../syntax/invalid/nested-async-arrow-fn-await.template         | 2 +-
 .../syntax/invalid/nested-async-arrow-fn-return-await.template  | 2 +-
 .../syntax/invalid/nested-async-function-await.template         | 2 +-
 .../syntax/invalid/nested-async-function-return-await.template  | 2 +-
 .../syntax/invalid/nested-async-function.template               | 2 +-
 .../syntax/invalid/nested-async-generator-await.template        | 2 +-
 src/dynamic-import/syntax/invalid/nested-block-labeled.template | 2 +-
 src/dynamic-import/syntax/invalid/nested-block.template         | 2 +-
 src/dynamic-import/syntax/invalid/nested-do-while.template      | 2 +-
 .../syntax/invalid/nested-else-braceless.template               | 2 +-
 src/dynamic-import/syntax/invalid/nested-else.template          | 2 +-
 .../syntax/invalid/nested-function-return.template              | 2 +-
 src/dynamic-import/syntax/invalid/nested-function.template      | 2 +-
 src/dynamic-import/syntax/invalid/nested-if-braceless.template  | 2 +-
 src/dynamic-import/syntax/invalid/nested-if.template            | 2 +-
 src/dynamic-import/syntax/invalid/nested-while.template         | 2 +-
 src/dynamic-import/syntax/invalid/nested-with.template          | 2 +-
 src/dynamic-import/syntax/invalid/top-level.template            | 2 +-
 .../syntax/valid/nested-arrow-assignment-expression.template    | 2 +-
 src/dynamic-import/syntax/valid/nested-arrow.template           | 2 +-
 .../syntax/valid/nested-async-arrow-fn-await.template           | 2 +-
 .../syntax/valid/nested-async-arrow-fn-return-await.template    | 2 +-
 .../syntax/valid/nested-async-function-await.template           | 2 +-
 .../syntax/valid/nested-async-function-return-await.template    | 2 +-
 src/dynamic-import/syntax/valid/nested-async-function.template  | 2 +-
 .../syntax/valid/nested-async-generator-await.template          | 2 +-
 src/dynamic-import/syntax/valid/nested-block-labeled.template   | 2 +-
 src/dynamic-import/syntax/valid/nested-block.template           | 2 +-
 src/dynamic-import/syntax/valid/nested-do-while.template        | 2 +-
 src/dynamic-import/syntax/valid/nested-else-braceless.template  | 2 +-
 src/dynamic-import/syntax/valid/nested-else.template            | 2 +-
 src/dynamic-import/syntax/valid/nested-function-return.template | 2 +-
 src/dynamic-import/syntax/valid/nested-function.template        | 2 +-
 src/dynamic-import/syntax/valid/nested-if-braceless.template    | 2 +-
 src/dynamic-import/syntax/valid/nested-if.template              | 2 +-
 src/dynamic-import/syntax/valid/nested-while.template           | 2 +-
 src/dynamic-import/syntax/valid/nested-with.template            | 2 +-
 src/dynamic-import/syntax/valid/top-level.template              | 2 +-
 76 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/dynamic-import/catch/nested-arrow.template b/src/dynamic-import/catch/nested-arrow.template
index 957927a367..b0ec1139d5 100644
--- a/src/dynamic-import/catch/nested-arrow.template
+++ b/src/dynamic-import/catch/nested-arrow.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-arrow-import-catch-
+path: language/expressions/dynamic-import/catch/nested-arrow-import-catch-
 name: nested arrow
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-arrow-fn-await.template b/src/dynamic-import/catch/nested-async-arrow-fn-await.template
index a97cf1a135..91ea2d2bc5 100644
--- a/src/dynamic-import/catch/nested-async-arrow-fn-await.template
+++ b/src/dynamic-import/catch/nested-async-arrow-fn-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/catch/nested-async-arrow-function-await-
+path: language/expressions/dynamic-import/catch/nested-async-arrow-function-await-
 name: nested in async arrow function, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-arrow-fn-return-await.template b/src/dynamic-import/catch/nested-async-arrow-fn-return-await.template
index 79ed5c69cb..caafb66afe 100644
--- a/src/dynamic-import/catch/nested-async-arrow-fn-return-await.template
+++ b/src/dynamic-import/catch/nested-async-arrow-fn-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-
+path: language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-
 name: nested in async arrow function, returned
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-function-await.template b/src/dynamic-import/catch/nested-async-function-await.template
index 99d2957b13..6656c422c2 100644
--- a/src/dynamic-import/catch/nested-async-function-await.template
+++ b/src/dynamic-import/catch/nested-async-function-await.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-async-function-await-
+path: language/expressions/dynamic-import/catch/nested-async-function-await-
 name: nested in async function, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-function-return-await.template b/src/dynamic-import/catch/nested-async-function-return-await.template
index 71e3010746..e648f5a1cc 100644
--- a/src/dynamic-import/catch/nested-async-function-return-await.template
+++ b/src/dynamic-import/catch/nested-async-function-return-await.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-async-function-return-await-
+path: language/expressions/dynamic-import/catch/nested-async-function-return-await-
 name: nested in async function, returns awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-function.template b/src/dynamic-import/catch/nested-async-function.template
index 257ac79e12..d7c9b4e67c 100644
--- a/src/dynamic-import/catch/nested-async-function.template
+++ b/src/dynamic-import/catch/nested-async-function.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-async-function-
+path: language/expressions/dynamic-import/catch/nested-async-function-
 name: nested in async function
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-generator-await.template b/src/dynamic-import/catch/nested-async-generator-await.template
index 4bbf79c731..756a20ee14 100644
--- a/src/dynamic-import/catch/nested-async-generator-await.template
+++ b/src/dynamic-import/catch/nested-async-generator-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/catch/nested-async-gen-await-
+path: language/expressions/dynamic-import/catch/nested-async-gen-await-
 name: nested in async generator, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-async-generator-return-await.template b/src/dynamic-import/catch/nested-async-generator-return-await.template
index eafcd573d4..7c6551d9a7 100644
--- a/src/dynamic-import/catch/nested-async-generator-return-await.template
+++ b/src/dynamic-import/catch/nested-async-generator-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/catch/nested-async-gen-return-await-
+path: language/expressions/dynamic-import/catch/nested-async-gen-return-await-
 name: nested in async generator, returns awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-block-labeled.template b/src/dynamic-import/catch/nested-block-labeled.template
index 2d1503dd64..53dc04f089 100644
--- a/src/dynamic-import/catch/nested-block-labeled.template
+++ b/src/dynamic-import/catch/nested-block-labeled.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-block-labeled-
+path: language/expressions/dynamic-import/catch/nested-block-labeled-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-block.template b/src/dynamic-import/catch/nested-block.template
index d17585b1a9..c349480f09 100644
--- a/src/dynamic-import/catch/nested-block.template
+++ b/src/dynamic-import/catch/nested-block.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-block-import-catch-
+path: language/expressions/dynamic-import/catch/nested-block-import-catch-
 name: nested block
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-do-while.template b/src/dynamic-import/catch/nested-do-while.template
index 644d834481..0ee385c4db 100644
--- a/src/dynamic-import/catch/nested-do-while.template
+++ b/src/dynamic-import/catch/nested-do-while.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-do-while-
+path: language/expressions/dynamic-import/catch/nested-do-while-
 name: nested do while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-else.template b/src/dynamic-import/catch/nested-else.template
index 0b994c52f6..2054e36fec 100644
--- a/src/dynamic-import/catch/nested-else.template
+++ b/src/dynamic-import/catch/nested-else.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-else-import-catch-
+path: language/expressions/dynamic-import/catch/nested-else-import-catch-
 name: nested else
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-function.template b/src/dynamic-import/catch/nested-function.template
index 311ac33b36..72b2a35a29 100644
--- a/src/dynamic-import/catch/nested-function.template
+++ b/src/dynamic-import/catch/nested-function.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-function-import-catch-
+path: language/expressions/dynamic-import/catch/nested-function-import-catch-
 name: nested function
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-if.template b/src/dynamic-import/catch/nested-if.template
index 60d639fe21..37612c8f8a 100644
--- a/src/dynamic-import/catch/nested-if.template
+++ b/src/dynamic-import/catch/nested-if.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-if-import-catch-
+path: language/expressions/dynamic-import/catch/nested-if-import-catch-
 name: nested if
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/nested-while.template b/src/dynamic-import/catch/nested-while.template
index c2dcdae201..52e96ac228 100644
--- a/src/dynamic-import/catch/nested-while.template
+++ b/src/dynamic-import/catch/nested-while.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/nested-while-import-catch-
+path: language/expressions/dynamic-import/catch/nested-while-import-catch-
 name: nested while
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/catch/top-level.template b/src/dynamic-import/catch/top-level.template
index 099dd891b7..996b521a7a 100644
--- a/src/dynamic-import/catch/top-level.template
+++ b/src/dynamic-import/catch/top-level.template
@@ -2,7 +2,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/module-code/dynamic-import/catch/top-level-import-catch-
+path: language/expressions/dynamic-import/catch/top-level-import-catch-
 name: top level
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-arrow-assign-expr.template b/src/dynamic-import/default/nested-arrow-assign-expr.template
index 1692b8e81b..6836527a4c 100644
--- a/src/dynamic-import/default/nested-arrow-assign-expr.template
+++ b/src/dynamic-import/default/nested-arrow-assign-expr.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-arrow-assignment-expression-
+path: language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-
 name: nested arrow
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-arrow.template b/src/dynamic-import/default/nested-arrow.template
index d010c20751..d54a0196db 100644
--- a/src/dynamic-import/default/nested-arrow.template
+++ b/src/dynamic-import/default/nested-arrow.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-arrow-import-then-
+path: language/expressions/dynamic-import/usage/nested-arrow-import-then-
 name: nested arrow
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-arrow-fn-await.template b/src/dynamic-import/default/nested-async-arrow-fn-await.template
index 9b3b33c2e0..ebb38357d5 100644
--- a/src/dynamic-import/default/nested-async-arrow-fn-await.template
+++ b/src/dynamic-import/default/nested-async-arrow-fn-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/usage/nested-async-arrow-function-await-
+path: language/expressions/dynamic-import/usage/nested-async-arrow-function-await-
 name: nested in async arrow function, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-arrow-fn-return-await.template b/src/dynamic-import/default/nested-async-arrow-fn-return-await.template
index b421e2b178..05aef5af4a 100644
--- a/src/dynamic-import/default/nested-async-arrow-fn-return-await.template
+++ b/src/dynamic-import/default/nested-async-arrow-fn-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-
+path: language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-
 name: nested in async arrow function, returned
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-function-await.template b/src/dynamic-import/default/nested-async-function-await.template
index 6847734545..499b8ef0dd 100644
--- a/src/dynamic-import/default/nested-async-function-await.template
+++ b/src/dynamic-import/default/nested-async-function-await.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-async-function-await-
+path: language/expressions/dynamic-import/usage/nested-async-function-await-
 name: nested in async function, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-function-return-await.template b/src/dynamic-import/default/nested-async-function-return-await.template
index 79158d65d7..4387b00c78 100644
--- a/src/dynamic-import/default/nested-async-function-return-await.template
+++ b/src/dynamic-import/default/nested-async-function-return-await.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-async-function-return-await-
+path: language/expressions/dynamic-import/usage/nested-async-function-return-await-
 name: nested in async function, returns awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-function.template b/src/dynamic-import/default/nested-async-function.template
index cfc641bb2a..7293af0ae6 100644
--- a/src/dynamic-import/default/nested-async-function.template
+++ b/src/dynamic-import/default/nested-async-function.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-async-function-
+path: language/expressions/dynamic-import/usage/nested-async-function-
 name: nested in async function
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-generator-await.template b/src/dynamic-import/default/nested-async-generator-await.template
index 3027234d77..df8c1cf584 100644
--- a/src/dynamic-import/default/nested-async-generator-await.template
+++ b/src/dynamic-import/default/nested-async-generator-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/usage/nested-async-gen-await-
+path: language/expressions/dynamic-import/usage/nested-async-gen-await-
 name: nested in async generator, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-async-generator-return-await.template b/src/dynamic-import/default/nested-async-generator-return-await.template
index 146a498aef..28feac608d 100644
--- a/src/dynamic-import/default/nested-async-generator-return-await.template
+++ b/src/dynamic-import/default/nested-async-generator-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/usage/nested-async-gen-return-await-
+path: language/expressions/dynamic-import/usage/nested-async-gen-return-await-
 name: nested in async generator, returns awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-block-labeled.template b/src/dynamic-import/default/nested-block-labeled.template
index 58c57cf27f..909fc9af22 100644
--- a/src/dynamic-import/default/nested-block-labeled.template
+++ b/src/dynamic-import/default/nested-block-labeled.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/syntax-nested-block-labeled-
+path: language/expressions/dynamic-import/usage/syntax-nested-block-labeled-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-block.template b/src/dynamic-import/default/nested-block.template
index 5ca6ac488b..ddc8b6451e 100644
--- a/src/dynamic-import/default/nested-block.template
+++ b/src/dynamic-import/default/nested-block.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-block-import-then-
+path: language/expressions/dynamic-import/usage/nested-block-import-then-
 name: nested block
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-do-while.template b/src/dynamic-import/default/nested-do-while.template
index 204da1c37f..1469957d40 100644
--- a/src/dynamic-import/default/nested-do-while.template
+++ b/src/dynamic-import/default/nested-do-while.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-do-while-
+path: language/expressions/dynamic-import/usage/nested-do-while-
 name: nested do while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-else.template b/src/dynamic-import/default/nested-else.template
index 1cb4be08f6..ebf4aa8e3f 100644
--- a/src/dynamic-import/default/nested-else.template
+++ b/src/dynamic-import/default/nested-else.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-else-import-then-
+path: language/expressions/dynamic-import/usage/nested-else-import-then-
 name: nested else
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-function.template b/src/dynamic-import/default/nested-function.template
index b99372ff81..2739b529f8 100644
--- a/src/dynamic-import/default/nested-function.template
+++ b/src/dynamic-import/default/nested-function.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-function-import-then-
+path: language/expressions/dynamic-import/usage/nested-function-import-then-
 name: nested function
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-if-braceless.template b/src/dynamic-import/default/nested-if-braceless.template
index 2374e28c29..8216a27796 100644
--- a/src/dynamic-import/default/nested-if-braceless.template
+++ b/src/dynamic-import/default/nested-if-braceless.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-if-braceless-
+path: language/expressions/dynamic-import/usage/nested-if-braceless-
 name: nested if syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-if.template b/src/dynamic-import/default/nested-if.template
index 9c07bf8514..3bcece7b2c 100644
--- a/src/dynamic-import/default/nested-if.template
+++ b/src/dynamic-import/default/nested-if.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-if-import-then-
+path: language/expressions/dynamic-import/usage/nested-if-import-then-
 name: nested if
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/nested-while.template b/src/dynamic-import/default/nested-while.template
index 97c400d0f0..d3001efabe 100644
--- a/src/dynamic-import/default/nested-while.template
+++ b/src/dynamic-import/default/nested-while.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/nested-while-import-then-
+path: language/expressions/dynamic-import/usage/nested-while-import-then-
 name: nested while
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/default/top-level.template b/src/dynamic-import/default/top-level.template
index bd46db1fcf..7323d47554 100644
--- a/src/dynamic-import/default/top-level.template
+++ b/src/dynamic-import/default/top-level.template
@@ -2,7 +2,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/module-code/dynamic-import/usage/top-level-import-then-
+path: language/expressions/dynamic-import/usage/top-level-import-then-
 name: top level
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/namespace/await.template b/src/dynamic-import/namespace/await.template
index f2ad5afe0a..c8022f2cb0 100644
--- a/src/dynamic-import/namespace/await.template
+++ b/src/dynamic-import/namespace/await.template
@@ -2,7 +2,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/module-code/dynamic-import/ns/await-
+path: language/expressions/dynamic-import/ns/await-
 name: value from await resolving
 esid: sec-finishdynamicimport
 info: |
diff --git a/src/dynamic-import/namespace/promise.template b/src/dynamic-import/namespace/promise.template
index fce701c04b..cf28772565 100644
--- a/src/dynamic-import/namespace/promise.template
+++ b/src/dynamic-import/namespace/promise.template
@@ -2,7 +2,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/module-code/dynamic-import/ns/promise-then-
+path: language/expressions/dynamic-import/ns/promise-then-
 name: value from promise then
 esid: sec-finishdynamicimport
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
index 639ec1a23c..d4bc7ada82 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-
+path: language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-arrow.template b/src/dynamic-import/syntax/invalid/nested-arrow.template
index f92d615bc0..e612f7438b 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-arrow-
+path: language/expressions/dynamic-import/syntax/invalid/nested-arrow-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
index 275900761d..e8e7f8abd9 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-
 name: nested in async arrow function, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
index 88e3b8e56a..745cd7f8ab 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-arrow-fn-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-
 name: nested in async arrow function, returned
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
index 74087382e1..1163ecdba2 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-async-function-await-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
index 661c80920f..ed254ccbb1 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function.template b/src/dynamic-import/syntax/invalid/nested-async-function.template
index 5cb6c074be..5df7986f00 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-async-function-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-function-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-async-generator-await.template b/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
index 22d33dc58d..1faf30ba39 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-generator-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-
+path: language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-
 name: nested in async generator, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-block-labeled.template b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
index e1c86d209f..005b8a78f3 100644
--- a/src/dynamic-import/syntax/invalid/nested-block-labeled.template
+++ b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-block-labeled-
+path: language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-block.template b/src/dynamic-import/syntax/invalid/nested-block.template
index 9f8a6e3b6c..86179ad8a1 100644
--- a/src/dynamic-import/syntax/invalid/nested-block.template
+++ b/src/dynamic-import/syntax/invalid/nested-block.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-block-
+path: language/expressions/dynamic-import/syntax/invalid/nested-block-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-do-while.template b/src/dynamic-import/syntax/invalid/nested-do-while.template
index 9d8c705c2e..d6f30142ab 100644
--- a/src/dynamic-import/syntax/invalid/nested-do-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-do-while.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-do-while-
+path: language/expressions/dynamic-import/syntax/invalid/nested-do-while-
 name: nested do while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-else-braceless.template b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
index 2a9997ad46..57c47213f7 100644
--- a/src/dynamic-import/syntax/invalid/nested-else-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-else-braceless-
+path: language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-
 name: nested else syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-else.template b/src/dynamic-import/syntax/invalid/nested-else.template
index 2042c31662..9cd633eafc 100644
--- a/src/dynamic-import/syntax/invalid/nested-else.template
+++ b/src/dynamic-import/syntax/invalid/nested-else.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-else-
+path: language/expressions/dynamic-import/syntax/invalid/nested-else-
 name: nested else syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-function-return.template b/src/dynamic-import/syntax/invalid/nested-function-return.template
index 875e9131fb..8ae06d5435 100644
--- a/src/dynamic-import/syntax/invalid/nested-function-return.template
+++ b/src/dynamic-import/syntax/invalid/nested-function-return.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-function-return-
+path: language/expressions/dynamic-import/syntax/invalid/nested-function-return-
 name: nested function syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-function.template b/src/dynamic-import/syntax/invalid/nested-function.template
index df99408228..3d42e87567 100644
--- a/src/dynamic-import/syntax/invalid/nested-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-function.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-function-
+path: language/expressions/dynamic-import/syntax/invalid/nested-function-
 name: nested function syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-if-braceless.template b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
index 820a1161ca..a2709b8943 100644
--- a/src/dynamic-import/syntax/invalid/nested-if-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-if-braceless-
+path: language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-
 name: nested if syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-if.template b/src/dynamic-import/syntax/invalid/nested-if.template
index 202e3517ef..4de50d4ea0 100644
--- a/src/dynamic-import/syntax/invalid/nested-if.template
+++ b/src/dynamic-import/syntax/invalid/nested-if.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-if-
+path: language/expressions/dynamic-import/syntax/invalid/nested-if-
 name: nested if syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-while.template b/src/dynamic-import/syntax/invalid/nested-while.template
index a2c27248ef..55eab906b1 100644
--- a/src/dynamic-import/syntax/invalid/nested-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-while.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-while-
+path: language/expressions/dynamic-import/syntax/invalid/nested-while-
 name: nested while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/nested-with.template b/src/dynamic-import/syntax/invalid/nested-with.template
index 225b9b44ba..8bad993104 100644
--- a/src/dynamic-import/syntax/invalid/nested-with.template
+++ b/src/dynamic-import/syntax/invalid/nested-with.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/nested-with-
+path: language/expressions/dynamic-import/syntax/invalid/nested-with-
 name: nested with syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/invalid/top-level.template b/src/dynamic-import/syntax/invalid/top-level.template
index 31fb845cb3..ee6eee8709 100644
--- a/src/dynamic-import/syntax/invalid/top-level.template
+++ b/src/dynamic-import/syntax/invalid/top-level.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/invalid/top-level-
+path: language/expressions/dynamic-import/syntax/invalid/top-level-
 name: top level syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template b/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
index 5b06b5c8a1..55d14a6def 100644
--- a/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-
+path: language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-arrow.template b/src/dynamic-import/syntax/valid/nested-arrow.template
index 491052c157..526b32ccf5 100644
--- a/src/dynamic-import/syntax/valid/nested-arrow.template
+++ b/src/dynamic-import/syntax/valid/nested-arrow.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-arrow-
+path: language/expressions/dynamic-import/syntax/valid/nested-arrow-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-arrow-fn-await.template b/src/dynamic-import/syntax/valid/nested-async-arrow-fn-await.template
index 50e8b9ea9d..8a313b765d 100644
--- a/src/dynamic-import/syntax/valid/nested-async-arrow-fn-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-arrow-fn-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-
 name: nested in async arrow function
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-arrow-fn-return-await.template b/src/dynamic-import/syntax/valid/nested-async-arrow-fn-return-await.template
index a9c181f469..1c08d86793 100644
--- a/src/dynamic-import/syntax/valid/nested-async-arrow-fn-return-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-arrow-fn-return-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-
 name: nested in async arrow function, returned
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-function-await.template b/src/dynamic-import/syntax/valid/nested-async-function-await.template
index 1072d23a06..ed4561ea7a 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function-await.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-async-function-await-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-function-await-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-function-return-await.template b/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
index 6ae8c305b5..76abae7418 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-function.template b/src/dynamic-import/syntax/valid/nested-async-function.template
index cec45979ba..3e2f8b7dab 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-async-function-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-function-
 name: nested arrow syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-async-generator-await.template b/src/dynamic-import/syntax/valid/nested-async-generator-await.template
index 38875160fc..02220c0a60 100644
--- a/src/dynamic-import/syntax/valid/nested-async-generator-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-generator-await.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-
+path: language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-
 name: nested in async generator, awaited
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-block-labeled.template b/src/dynamic-import/syntax/valid/nested-block-labeled.template
index cb85b8bcd3..40524edfa3 100644
--- a/src/dynamic-import/syntax/valid/nested-block-labeled.template
+++ b/src/dynamic-import/syntax/valid/nested-block-labeled.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-block-labeled-
+path: language/expressions/dynamic-import/syntax/valid/nested-block-labeled-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-block.template b/src/dynamic-import/syntax/valid/nested-block.template
index 18d711ee76..a2ce29f770 100644
--- a/src/dynamic-import/syntax/valid/nested-block.template
+++ b/src/dynamic-import/syntax/valid/nested-block.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-block-
+path: language/expressions/dynamic-import/syntax/valid/nested-block-
 name: nested block syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-do-while.template b/src/dynamic-import/syntax/valid/nested-do-while.template
index b2c71cd73f..51f1497b05 100644
--- a/src/dynamic-import/syntax/valid/nested-do-while.template
+++ b/src/dynamic-import/syntax/valid/nested-do-while.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-do-while-
+path: language/expressions/dynamic-import/syntax/valid/nested-do-while-
 name: nested do while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-else-braceless.template b/src/dynamic-import/syntax/valid/nested-else-braceless.template
index f031a07c5c..59208ba73d 100644
--- a/src/dynamic-import/syntax/valid/nested-else-braceless.template
+++ b/src/dynamic-import/syntax/valid/nested-else-braceless.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-else-braceless-
+path: language/expressions/dynamic-import/syntax/valid/nested-else-braceless-
 name: nested else syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-else.template b/src/dynamic-import/syntax/valid/nested-else.template
index 81c10cdcfa..23e9703634 100644
--- a/src/dynamic-import/syntax/valid/nested-else.template
+++ b/src/dynamic-import/syntax/valid/nested-else.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-else-
+path: language/expressions/dynamic-import/syntax/valid/nested-else-
 name: nested else syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-function-return.template b/src/dynamic-import/syntax/valid/nested-function-return.template
index 619d369cb1..ce9a52adef 100644
--- a/src/dynamic-import/syntax/valid/nested-function-return.template
+++ b/src/dynamic-import/syntax/valid/nested-function-return.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-function-return-
+path: language/expressions/dynamic-import/syntax/valid/nested-function-return-
 name: nested function syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-function.template b/src/dynamic-import/syntax/valid/nested-function.template
index 25c730bba6..8dbf5e25a8 100644
--- a/src/dynamic-import/syntax/valid/nested-function.template
+++ b/src/dynamic-import/syntax/valid/nested-function.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-function-
+path: language/expressions/dynamic-import/syntax/valid/nested-function-
 name: nested function syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-if-braceless.template b/src/dynamic-import/syntax/valid/nested-if-braceless.template
index a620bad7e3..ea0068ec37 100644
--- a/src/dynamic-import/syntax/valid/nested-if-braceless.template
+++ b/src/dynamic-import/syntax/valid/nested-if-braceless.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-if-braceless-
+path: language/expressions/dynamic-import/syntax/valid/nested-if-braceless-
 name: nested if syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-if.template b/src/dynamic-import/syntax/valid/nested-if.template
index a8add970de..4b86356368 100644
--- a/src/dynamic-import/syntax/valid/nested-if.template
+++ b/src/dynamic-import/syntax/valid/nested-if.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-if-
+path: language/expressions/dynamic-import/syntax/valid/nested-if-
 name: nested if syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-while.template b/src/dynamic-import/syntax/valid/nested-while.template
index d1cffee349..e3373b8ed5 100644
--- a/src/dynamic-import/syntax/valid/nested-while.template
+++ b/src/dynamic-import/syntax/valid/nested-while.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-while-
+path: language/expressions/dynamic-import/syntax/valid/nested-while-
 name: nested while syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/nested-with.template b/src/dynamic-import/syntax/valid/nested-with.template
index 8ee2d5a61c..8671960097 100644
--- a/src/dynamic-import/syntax/valid/nested-with.template
+++ b/src/dynamic-import/syntax/valid/nested-with.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/nested-with-
+path: language/expressions/dynamic-import/syntax/valid/nested-with-
 name: nested with syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
diff --git a/src/dynamic-import/syntax/valid/top-level.template b/src/dynamic-import/syntax/valid/top-level.template
index ba421abeec..c5b4291d11 100644
--- a/src/dynamic-import/syntax/valid/top-level.template
+++ b/src/dynamic-import/syntax/valid/top-level.template
@@ -2,7 +2,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/module-code/dynamic-import/syntax/valid/top-level-
+path: language/expressions/dynamic-import/syntax/valid/top-level-
 name: top level syntax
 esid: sec-import-call-runtime-semantics-evaluation
 info: |
-- 
GitLab