diff --git a/src/dynamic-import/catch/nested-arrow.template b/src/dynamic-import/catch/nested-arrow.template index 957927a3671c07d31e21b8727b54ab9a1b9defac..b0ec1139d5377c7a403c656bc7d888a3ed8d1d36 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 a97cf1a1351804ea8634b7f520e577730136d54e..91ea2d2bc5359a33be6f690163b361b282d72607 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 79ed5c69cb0a3d18afe8072547b763d59ac6ced8..caafb66afed4157f460316aba4e07174871dee1f 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 99d2957b13ebe44be88f502811e1a11175a0b7a8..6656c422c2b8d58a3fdf0da47e5e87f20ad65a82 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 71e3010746b37f6b79a587bfce843761a7147b56..e648f5a1cc073768d5a650bfb56357c4599d5d64 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 257ac79e12c4ec22e7eeb61e130dbc751c89b983..d7c9b4e67c3506631884754466dee1187df7d377 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 4bbf79c73122c63a72de517691f6d79fc42e3b4e..756a20ee141cd76f54c7da648701fd8cb04ea57e 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 eafcd573d4096965d94b7319265ea944873bf820..7c6551d9a7b3e96c8bb4338bca4839e206c35c82 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 2d1503dd640a53653f4432e8bd8728c1ecf55879..53dc04f0897d135dba475220771e50eb14113aa1 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 d17585b1a9e14fae164f7e0863fd0652e331110e..c349480f091e7472d9c756f16bbb86ee20fb00e9 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 644d83448123824eff3740096e7e4a595bc841f0..0ee385c4dbecbdf046d889f8fde3a3f8ff4f7e39 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 0b994c52f6bec471eda3f41f716e81d0102a6f92..2054e36fecb92b64121d32aef0fb60f641e73633 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 311ac33b363ebb2947be05666f2be3a4d3ba1ad3..72b2a35a29c410102e6fe853ed35d61d2067975c 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 60d639fe21a92fe0846d01a709fd83bfe9e5f404..37612c8f8a370fdc556d0cfa1a670c5050acf96e 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 c2dcdae201bb05a4c6edc004936ecc4484fb0767..52e96ac228da611790523d3073dd9c1cf9a01963 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 099dd891b7e32c553d0d66f20ef41bfc30fe27bd..996b521a7a4b09dbb3d6ae6837756f48647a2003 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 1692b8e81beee6ff64dd80fef8d6bc71dc2d0a53..6836527a4ce5c0ba3507517969079735857433b1 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 d010c20751ca6718809e888781ca6c16301bdd9d..d54a0196db238bd8bafacea892ea02148f8bed17 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 9b3b33c2e05c58895cbd1bcf1a9f2a1ec9532bdf..ebb38357d5071a19dc594ed5260cb5e770f9624b 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 b421e2b178ac8aabc15a7aeb561e72f23a1ecb57..05aef5af4aa1be8850c1452aeaa63ca22610a237 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 6847734545a059967a69282c9728bb59cca833c1..499b8ef0dd44cf4f91e41559d22cafe81097af54 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 79158d65d741238cd58e77fd33243d1c1c825277..4387b00c783c3840be59798b364db296edb050ab 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 cfc641bb2a4332b9e4f65c12083091d6412092ab..7293af0ae68e519791e15d67d25c94a8c8efed0b 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 3027234d774bd093d949bbc5378c489576af841e..df8c1cf58474d7277a687252000d3ed1c6f35922 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 146a498aef6a929cafa9b92336ae019f34f8396c..28feac608d93847ecfb1863d8e66fdbb0460277d 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 58c57cf27f32507d8de79f51c6876908c8d460fc..909fc9af2212db6b9ab03ae6db0ea972547c0380 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 5ca6ac488bbdf36b4506d009bb9a602418bf4156..ddc8b6451e96d23ed3694715996fd7e10e52099b 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 204da1c37f83a6f01ef1be79ead85b5d60531388..1469957d407983624dc9ef4487dfe4237d968d09 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 1cb4be08f6e1af2aeea005fa54aee64235f6bf4c..ebf4aa8e3fabb80def452b76f0929d98f5e11a4d 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 b99372ff819c62488681c50414406e672734e383..2739b529f8146d639c30e266fc7c6293532ff5a9 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 2374e28c29597dd05c15c02f725301f4a990c49c..8216a2779696b8942a3c5a00ce2039fc76d0950f 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 9c07bf8514498349c32c58a6ee4595afd4da3b7c..3bcece7b2c52f05f06d93086b2a098d860fe5915 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 97c400d0f0d459eebc8e2d9b91b3004943f79f5e..d3001efabe997912ef61d1d08f4e0d8656f219a3 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 bd46db1fcfe96fb552b8d80c05c077500151f52d..7323d4755401194247b8878426f9f52e09c5e476 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 f2ad5afe0a7d630358578d64e277aa66e7012f6a..6d5691e36c7bd422aa553f8e749e87219c5ac8b4 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/namespace/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 fce701c04ba3fd793d770e34049684d1dd6d33ab..1c5e7c71d0a519c18fcc065923b936bd1d6a131e 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/namespace/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 639ec1a23c97104d1035ee919b8554fd9bc7a70b..d4bc7ada8268fff911f6ec87c2b897f4df5b29f5 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 f92d615bc0ccdbbbf4ff8868e16123534d3c400b..e612f7438bbdcd6c436a4d5e13135b39c379d918 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 275900761d1ac72fc9791535af4ad327541ff70c..e8e7f8abd98e84cef566c790925fe5d9b594d037 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 88e3b8e56a0cfba6deeb0e77ea5f75adc616113f..745cd7f8ab13d7ed792f1a1afd7f94d569a5f1e3 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 74087382e113ab83e47944f4dec7b785d6015c9f..1163ecdba2ade9d62265c0dedf9c5b4c7b174bf8 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 661c80920f678a51d27b18a5bdd998b191c42429..ed254ccbb15fec7890cdac00dcff8151cfaad7a4 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 5cb6c074be0eeacf6a8e72d51511a8032ed0ae36..5df7986f002b8b617530b81cd49d64a83accdd1a 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 22d33dc58d6704f151a39f93d4eefc968cc305ec..1faf30ba39e6a5fdeea85b0fbd216173e5460b47 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 e1c86d209f562ccac56bd22001db553fa321914a..005b8a78f316205dc29e4c92c536d402101461c1 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 9f8a6e3b6cc8f076a2042135dfdba1609b4e573a..86179ad8a1e377189dcf6ea2fb0bb7cc32c193ca 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 9d8c705c2e093ec868ee479208ae70ec2c0f6fa0..d6f30142ab389197ad6b10b1cb35e18ad48ef496 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 2a9997ad46d44469a470663f07e77daecfe16d49..57c47213f7a038d0071d93220fdad2be76a0b3cd 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 2042c316628e97e858ef39a2cf56373bdbe52830..9cd633eafceb46fff5229482c2982a6946cdee13 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 875e9131fbd1caeb86450d35d1e7ef16d843997b..8ae06d5435e0524bb9aeb316b5caaf5bd6beb82b 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 df99408228a04d19ffe6d6d5cdf24763369ce77c..3d42e8756702fc86d1ac8cae4fc8998c2cc78d06 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 820a1161ca2543bf7f61e33c9b974035a1fbcde4..a2709b8943765380500e4cb4dc4d2b1c96a0271c 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 202e3517efe2568e9e07a6649a33ca8f83cc1569..4de50d4ea05fd93ba6464f641b8dbbf27715c4f0 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 a2c27248ef358435566dfe3bfa545a40b259730b..55eab906b1a252420625af0122f5d4d2af6b9172 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 225b9b44badefc6a08bb9b30102ec1501cc1e697..8bad9931046e2c30fc2e464b4be5c318deb8949b 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 31fb845cb3d21171b5a47ae95bce1299ced0d7af..ee6eee8709938e9f716f435b026564ab1e0b16a1 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 5b06b5c8a106a4b501cbf56cdf59b90113647ddd..55d14a6def3580e61051b7e0b80b035171cd5cdb 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 491052c1572adc526b4d91dda322b33b4e31b9af..526b32ccf5126bd4ca7ca12232b1399f3d65368b 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 50e8b9ea9d674e7da453b00fe77c8d9dc37e4f7e..8a313b765db34e17128c08534a19dd70c326bbeb 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 a9c181f469079296a99853717081b9a8deeb667b..1c08d867931b9cf2e8697a95e0c8963248222cf6 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 1072d23a06630d37f36fbeffa5000b68e34b6ee1..ed4561ea7a9620c4ad0e19e4152812d585fc67dc 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 6ae8c305b54133b43019d8b650ee9722118d896c..76abae74188241dbecb1fec4ff6764d4ae246a8b 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 cec45979baee6c5c1de0f8261b2829763a5bb0c2..3e2f8b7dabe7418fec7c2dcf718454731605a951 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 38875160fcaff870a0e1e33bf8d63e5e628e793c..02220c0a60b5c04d8bb56d9c6af5b1614ee4bb86 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 cb85b8bcd375967852f997d0cceedeb267876643..40524edfa3d714c0b8afc7e9c86195b23d2db2c5 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 18d711ee761145fe93bfc6d7d5370f988e479326..a2ce29f770d94a800ef08e3d8e7f021413fa51a5 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 b2c71cd73f9a9b7208e2cd904dffc0c0e8150e3e..51f1497b05c3c5dcc8dbebafa8257a3209a4c68b 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 f031a07c5ca79eb875b7145ec4a8096b385aeb23..59208ba73d44fd8eae67581f63f44133a054b863 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 81c10cdcfa6e2812243089edbc94533c79def157..23e9703634ff4d3e60f4dcada8c1ddcf2e6c3231 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 619d369cb1f790e330d350aea0fcf7cad674bf41..ce9a52adef885e2449d6d8c575dc26bfe107e9a6 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 25c730bba680af302737168bce0256842db87c18..8dbf5e25a84e183bf4ba8e12e9bf38ecfbb3593a 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 a620bad7e37831bc11dc70b28615257c70168cb8..ea0068ec3709da46979fae0ac288f05d8ca21d11 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 a8add970defae4ffa3c972b028f547bca574c2e1..4b86356368640275b96f6e3ea64937656652e252 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 d1cffee34988bc0afce0b2af2be57f3a4b830a04..e3373b8ed540d8e0250b821ec656b7ec19e80ce7 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 8ee2d5a61c888eeaacb7eb01013800f6e40fec8f..8671960097595209eb2d68f891e41b0c49803e1c 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 ba421abeec7480c0926f52c339b604a08d5549bc..c5b4291d116ddc4b85b4e8f0ede2396714d36b71 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: | diff --git a/test/language/module-code/dynamic-import/assign-expr-get-value-abrupt-throws.js b/test/language/expressions/dynamic-import/assign-expr-get-value-abrupt-throws.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr-get-value-abrupt-throws.js rename to test/language/expressions/dynamic-import/assign-expr-get-value-abrupt-throws.js diff --git a/test/language/module-code/dynamic-import/assign-expr/additive-expr.js b/test/language/expressions/dynamic-import/assign-expr/additive-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/additive-expr.js rename to test/language/expressions/dynamic-import/assign-expr/additive-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/array-literal.js b/test/language/expressions/dynamic-import/assign-expr/array-literal.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/array-literal.js rename to test/language/expressions/dynamic-import/assign-expr/array-literal.js diff --git a/test/language/module-code/dynamic-import/assign-expr/arrow-function.js b/test/language/expressions/dynamic-import/assign-expr/arrow-function.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/arrow-function.js rename to test/language/expressions/dynamic-import/assign-expr/arrow-function.js diff --git a/test/language/module-code/dynamic-import/assign-expr/await-expr.js b/test/language/expressions/dynamic-import/assign-expr/await-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/await-expr.js rename to test/language/expressions/dynamic-import/assign-expr/await-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/await-identifier.js b/test/language/expressions/dynamic-import/assign-expr/await-identifier.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/await-identifier.js rename to test/language/expressions/dynamic-import/assign-expr/await-identifier.js diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-arguments.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-arguments.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/call-expr-arguments.js rename to test/language/expressions/dynamic-import/assign-expr/call-expr-arguments.js diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-expr.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/call-expr-expr.js rename to test/language/expressions/dynamic-import/assign-expr/call-expr-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/call-expr-identifier.js b/test/language/expressions/dynamic-import/assign-expr/call-expr-identifier.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/call-expr-identifier.js rename to test/language/expressions/dynamic-import/assign-expr/call-expr-identifier.js diff --git a/test/language/module-code/dynamic-import/assign-expr/cover-call-expr.js b/test/language/expressions/dynamic-import/assign-expr/cover-call-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/cover-call-expr.js rename to test/language/expressions/dynamic-import/assign-expr/cover-call-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/cover-parenthesized-expr.js b/test/language/expressions/dynamic-import/assign-expr/cover-parenthesized-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/cover-parenthesized-expr.js rename to test/language/expressions/dynamic-import/assign-expr/cover-parenthesized-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/identifier.js b/test/language/expressions/dynamic-import/assign-expr/identifier.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/identifier.js rename to test/language/expressions/dynamic-import/assign-expr/identifier.js diff --git a/test/language/module-code/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js rename to test/language/expressions/dynamic-import/assign-expr/lhs-assign-operator-assign-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/lhs-eq-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/lhs-eq-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/lhs-eq-assign-expr.js rename to test/language/expressions/dynamic-import/assign-expr/lhs-eq-assign-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/logical-and-expr.js b/test/language/expressions/dynamic-import/assign-expr/logical-and-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/logical-and-expr.js rename to test/language/expressions/dynamic-import/assign-expr/logical-and-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/logical-or-expr.js b/test/language/expressions/dynamic-import/assign-expr/logical-or-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/logical-or-expr.js rename to test/language/expressions/dynamic-import/assign-expr/logical-or-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/member-expr.js b/test/language/expressions/dynamic-import/assign-expr/member-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/member-expr.js rename to test/language/expressions/dynamic-import/assign-expr/member-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/module-code-other_FIXTURE.js b/test/language/expressions/dynamic-import/assign-expr/module-code-other_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/module-code-other_FIXTURE.js rename to test/language/expressions/dynamic-import/assign-expr/module-code-other_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/assign-expr/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/assign-expr/module-code_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/module-code_FIXTURE.js rename to test/language/expressions/dynamic-import/assign-expr/module-code_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/assign-expr/new-target.js b/test/language/expressions/dynamic-import/assign-expr/new-target.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/new-target.js rename to test/language/expressions/dynamic-import/assign-expr/new-target.js diff --git a/test/language/module-code/dynamic-import/assign-expr/object-literal.js b/test/language/expressions/dynamic-import/assign-expr/object-literal.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/object-literal.js rename to test/language/expressions/dynamic-import/assign-expr/object-literal.js diff --git a/test/language/module-code/dynamic-import/assign-expr/tagged-function-call.js b/test/language/expressions/dynamic-import/assign-expr/tagged-function-call.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/tagged-function-call.js rename to test/language/expressions/dynamic-import/assign-expr/tagged-function-call.js diff --git a/test/language/module-code/dynamic-import/assign-expr/ternary.js b/test/language/expressions/dynamic-import/assign-expr/ternary.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/ternary.js rename to test/language/expressions/dynamic-import/assign-expr/ternary.js diff --git a/test/language/module-code/dynamic-import/assign-expr/this.js b/test/language/expressions/dynamic-import/assign-expr/this.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/this.js rename to test/language/expressions/dynamic-import/assign-expr/this.js diff --git a/test/language/module-code/dynamic-import/assign-expr/unary-expr.js b/test/language/expressions/dynamic-import/assign-expr/unary-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/unary-expr.js rename to test/language/expressions/dynamic-import/assign-expr/unary-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-assign-expr.js b/test/language/expressions/dynamic-import/assign-expr/yield-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/yield-assign-expr.js rename to test/language/expressions/dynamic-import/assign-expr/yield-assign-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-expr.js b/test/language/expressions/dynamic-import/assign-expr/yield-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/yield-expr.js rename to test/language/expressions/dynamic-import/assign-expr/yield-expr.js diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-identifier.js b/test/language/expressions/dynamic-import/assign-expr/yield-identifier.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/yield-identifier.js rename to test/language/expressions/dynamic-import/assign-expr/yield-identifier.js diff --git a/test/language/module-code/dynamic-import/assign-expr/yield-star.js b/test/language/expressions/dynamic-import/assign-expr/yield-star.js similarity index 100% rename from test/language/module-code/dynamic-import/assign-expr/yield-star.js rename to test/language/expressions/dynamic-import/assign-expr/yield-star.js diff --git a/test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js b/test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-type_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js b/test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/eval-rqstd-abrupt-err-uri_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-1_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-2_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous-export_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-ambiguous_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-circular-1_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js b/test/language/expressions/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/instn-iee-err-circular-2_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-arrow-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-arrow-function-return-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-return-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-function-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-async-gen-return-await-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-block-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-block-labeled-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-do-while-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-do-while-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-do-while-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-else-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-function-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-if-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/nested-while-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/catch/script-code_FIXTURE.js b/test/language/expressions/dynamic-import/catch/script-code_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/script-code_FIXTURE.js rename to test/language/expressions/dynamic-import/catch/script-code_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-typeerror.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-rqstd-abrupt-urierror.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-eval-script-code-target.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-file-does-not-exist.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-ambiguous-import.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-instn-iee-err-circular.js diff --git a/test/language/module-code/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js b/test/language/expressions/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js similarity index 100% rename from test/language/module-code/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js rename to test/language/expressions/dynamic-import/catch/top-level-import-catch-specifier-tostring-abrupt-rejects.js diff --git a/test/language/module-code/dynamic-import/dynamic-import-module_FIXTURE.js b/test/language/expressions/dynamic-import/dynamic-import-module_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/dynamic-import-module_FIXTURE.js rename to test/language/expressions/dynamic-import/dynamic-import-module_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/empty_FIXTURE.js b/test/language/expressions/dynamic-import/empty_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/empty_FIXTURE.js rename to test/language/expressions/dynamic-import/empty_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-anon.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-anon.js rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-anon.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-name-meth.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-name-meth.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-name-meth.js rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-name-meth.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-cls-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-cls-named.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-cls-named.js rename to test/language/expressions/dynamic-import/eval-export-dflt-cls-named.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-anon.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-anon.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-anon.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-name-meth.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-name-meth.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-name-meth.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-name-meth.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-named.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-cls-named.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-cls-named.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-anon.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-anon.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-anon.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-named.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-fn-named.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-fn-named.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-anon.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-anon.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-anon.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-anon.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-named.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-named.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-gen-named.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-gen-named.js diff --git a/test/language/module-code/dynamic-import/eval-export-dflt-expr-in.js b/test/language/expressions/dynamic-import/eval-export-dflt-expr-in.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-export-dflt-expr-in.js rename to test/language/expressions/dynamic-import/eval-export-dflt-expr-in.js diff --git a/test/language/module-code/dynamic-import/eval-rqstd-once.js b/test/language/expressions/dynamic-import/eval-rqstd-once.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-rqstd-once.js rename to test/language/expressions/dynamic-import/eval-rqstd-once.js diff --git a/test/language/module-code/dynamic-import/eval-rqstd-once_FIXTURE.js b/test/language/expressions/dynamic-import/eval-rqstd-once_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-rqstd-once_FIXTURE.js rename to test/language/expressions/dynamic-import/eval-rqstd-once_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/eval-self-once-module.js b/test/language/expressions/dynamic-import/eval-self-once-module.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-self-once-module.js rename to test/language/expressions/dynamic-import/eval-self-once-module.js diff --git a/test/language/module-code/dynamic-import/eval-self-once-script.js b/test/language/expressions/dynamic-import/eval-self-once-script.js similarity index 100% rename from test/language/module-code/dynamic-import/eval-self-once-script.js rename to test/language/expressions/dynamic-import/eval-self-once-script.js diff --git a/test/language/module-code/dynamic-import/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/module-code_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/module-code_FIXTURE.js rename to test/language/expressions/dynamic-import/module-code_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/namespace/await-ns-Symbol-toStringTag.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-Symbol-toStringTag.js rename to test/language/expressions/dynamic-import/namespace/await-ns-Symbol-toStringTag.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-define-own-property.js b/test/language/expressions/dynamic-import/namespace/await-ns-define-own-property.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-define-own-property.js rename to test/language/expressions/dynamic-import/namespace/await-ns-define-own-property.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-delete-exported-init-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-delete-non-exported-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-extensible.js rename to test/language/expressions/dynamic-import/namespace/await-ns-extensible.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-direct.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-direct.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-indirect.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-indirect.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-props-nrml.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-props-nrml.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-found-init.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-found-init.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-found-init.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-sym.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-own-property-sym.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-sym.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-str-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-str-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-str-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-str-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-sym-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-sym-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-sym-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-sym-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-sym-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-get-sym-not-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-get-sym-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-found-init.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-str-found-init.js rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-found-init.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-has-property-sym-not-found.js rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-no-iterator.js b/test/language/expressions/dynamic-import/namespace/await-ns-no-iterator.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-no-iterator.js rename to test/language/expressions/dynamic-import/namespace/await-ns-no-iterator.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/namespace/await-ns-own-property-keys-sort.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-own-property-keys-sort.js rename to test/language/expressions/dynamic-import/namespace/await-ns-own-property-keys-sort.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-object.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-object.js rename to test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-object.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-reflect.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-prevent-extensions-reflect.js rename to test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-reflect.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prop-descs.js b/test/language/expressions/dynamic-import/namespace/await-ns-prop-descs.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-prop-descs.js rename to test/language/expressions/dynamic-import/namespace/await-ns-prop-descs.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-prototype.js b/test/language/expressions/dynamic-import/namespace/await-ns-prototype.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-prototype.js rename to test/language/expressions/dynamic-import/namespace/await-ns-prototype.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-no-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of-null.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of-null.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of-null.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-prototype-of.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-same-values-no-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-same-values-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-strict.js diff --git a/test/language/module-code/dynamic-import/ns/await-ns-set-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/await-ns-set-strict.js rename to test/language/expressions/dynamic-import/namespace/await-ns-set-strict.js diff --git a/test/language/module-code/dynamic-import/ns/default-property-not-set-own.js b/test/language/expressions/dynamic-import/namespace/default-property-not-set-own.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/default-property-not-set-own.js rename to test/language/expressions/dynamic-import/namespace/default-property-not-set-own.js diff --git a/test/language/module-code/dynamic-import/ns/define-own-property_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/define-own-property_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/define-own-property_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/define-own-property_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/empty_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/empty_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/empty_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/empty_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named-end_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named-end_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-1_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-1_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-2_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-2_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-3_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-3_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/module-code_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/module-code_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/module-code_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/own-keys-sort_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/own-keys-sort_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/own-keys-sort_FIXTURE.js rename to test/language/expressions/dynamic-import/namespace/own-keys-sort_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-Symbol-toStringTag.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-Symbol-toStringTag.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-define-own-property.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-define-own-property.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-define-own-property.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-define-own-property.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-extensible.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-direct.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-direct.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-indirect.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-indirect.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-props-nrml.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-props-nrml.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-found-init.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-found-init.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-sym.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-own-property-sym.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-sym.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-get-sym-not-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-found-init.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-found-init.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-not-found.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-not-found.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-no-iterator.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-no-iterator.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-no-iterator.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-no-iterator.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-own-property-keys-sort.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-own-property-keys-sort.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-object.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-object.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-reflect.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-reflect.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prop-descs.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prop-descs.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prop-descs.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prop-descs.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-prototype.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prototype.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-prototype.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prototype.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-no-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of-null.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of-null.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-prototype-of.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-no-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-no-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-same-values-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-strict.js diff --git a/test/language/module-code/dynamic-import/ns/promise-then-ns-set-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-strict.js similarity index 100% rename from test/language/module-code/dynamic-import/ns/promise-then-ns-set-strict.js rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-strict.js diff --git a/test/language/module-code/dynamic-import/returns-promise.js b/test/language/expressions/dynamic-import/returns-promise.js similarity index 100% rename from test/language/module-code/dynamic-import/returns-promise.js rename to test/language/expressions/dynamic-import/returns-promise.js diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object-from-import.js b/test/language/expressions/dynamic-import/reuse-namespace-object-from-import.js similarity index 100% rename from test/language/module-code/dynamic-import/reuse-namespace-object-from-import.js rename to test/language/expressions/dynamic-import/reuse-namespace-object-from-import.js diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object-from-script.js b/test/language/expressions/dynamic-import/reuse-namespace-object-from-script.js similarity index 100% rename from test/language/module-code/dynamic-import/reuse-namespace-object-from-script.js rename to test/language/expressions/dynamic-import/reuse-namespace-object-from-script.js diff --git a/test/language/module-code/dynamic-import/reuse-namespace-object.js b/test/language/expressions/dynamic-import/reuse-namespace-object.js similarity index 100% rename from test/language/module-code/dynamic-import/reuse-namespace-object.js rename to test/language/expressions/dynamic-import/reuse-namespace-object.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-assignment-expression-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-arrow-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-await-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-arrow-function-return-await-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-await-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-function-return-await-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-async-gen-await-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-labeled-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-block-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-do-while-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-braceless-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-else-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-function-return-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-braceless-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-if-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-while-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/nested-with-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-assignment-expr-not-optional.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-args.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-args.js rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-args.js diff --git a/test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js b/test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js rename to test/language/expressions/dynamic-import/syntax/invalid/top-level-not-extensible-no-trailing-comma.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/empty_FIXTURE.js b/test/language/expressions/dynamic-import/syntax/valid/empty_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/empty_FIXTURE.js rename to test/language/expressions/dynamic-import/syntax/valid/empty_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-assignment-expression-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-arrow-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-await-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-arrow-function-return-await-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-await-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-return-await-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-function-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-async-gen-await-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-labeled-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-block-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-block-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-block-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-block-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-do-while-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-braceless-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-else-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-else-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-else-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-else-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-return-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-function-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-function-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-function-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-function-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-braceless-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-if-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-if-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-if-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-if-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-while-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-while-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-while-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-while-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/nested-with-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/nested-with-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/nested-with-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/nested-with-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js rename to test/language/expressions/dynamic-import/syntax/valid/top-level-empty-str-is-valid-assign-expr.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-nested-imports.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-nested-imports.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/top-level-nested-imports.js rename to test/language/expressions/dynamic-import/syntax/valid/top-level-nested-imports.js diff --git a/test/language/module-code/dynamic-import/syntax/valid/top-level-script-code-valid.js b/test/language/expressions/dynamic-import/syntax/valid/top-level-script-code-valid.js similarity index 100% rename from test/language/module-code/dynamic-import/syntax/valid/top-level-script-code-valid.js rename to test/language/expressions/dynamic-import/syntax/valid/top-level-script-code-valid.js diff --git a/test/language/module-code/dynamic-import/usage/dynamic-import-module_FIXTURE.js b/test/language/expressions/dynamic-import/usage/dynamic-import-module_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/dynamic-import-module_FIXTURE.js rename to test/language/expressions/dynamic-import/usage/dynamic-import-module_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js b/test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js rename to test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js b/test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js rename to test/language/expressions/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/usage/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/usage/module-code_FIXTURE.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/module-code_FIXTURE.js rename to test/language/expressions/dynamic-import/usage/module-code_FIXTURE.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-assignment-expression-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-arrow-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-arrow-function-return-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-return-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-function-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-function-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-function-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-function-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-function-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-async-gen-return-await-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-block-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-block-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-block-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-block-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-do-while-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-do-while-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-do-while-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-do-while-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-do-while-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-else-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-else-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-else-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-else-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-function-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-function-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-function-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-function-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-braceless-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-if-braceless-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-braceless-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-if-braceless-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-if-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-if-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-if-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-if-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/nested-while-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/nested-while-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/nested-while-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/nested-while-import-then-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/syntax-nested-block-labeled-specifier-tostring.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update-dflt.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-gtbndng-indirect-update.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-eval-script-code-host-resolves-module-code.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-is-call-expression-square-brackets.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-returns-thenable.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-returns-thenable.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-returns-thenable.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-returns-thenable.js diff --git a/test/language/module-code/dynamic-import/usage/top-level-import-then-specifier-tostring.js b/test/language/expressions/dynamic-import/usage/top-level-import-then-specifier-tostring.js similarity index 100% rename from test/language/module-code/dynamic-import/usage/top-level-import-then-specifier-tostring.js rename to test/language/expressions/dynamic-import/usage/top-level-import-then-specifier-tostring.js