diff --git a/compiler/forget/src/__tests__/hir-test.ts b/compiler/forget/src/__tests__/compiler-test.ts
similarity index 98%
rename from compiler/forget/src/__tests__/hir-test.ts
rename to compiler/forget/src/__tests__/compiler-test.ts
index e4cf33ea04..4771b2875f 100644
--- a/compiler/forget/src/__tests__/hir-test.ts
+++ b/compiler/forget/src/__tests__/compiler-test.ts
@@ -33,7 +33,7 @@ const FlowPragmas = [/\/\/\s@flow$/gm, /\*\s@flow$/gm];
 
 describe("React Forget (HIR version)", () => {
   generateTestsFromFixtures(
-    path.join(__dirname, "fixtures", "hir"),
+    path.join(__dirname, "fixtures", "compiler"),
     (input, file, options) => {
       const matches = input.matchAll(Pragma_RE);
 
diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-function-renamed-ref.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-function-renamed-ref.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-function-renamed-ref.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-function-renamed-ref.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-function-renamed-ref.js b/compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-function-renamed-ref.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-function-renamed-ref.js
rename to compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-function-renamed-ref.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-reference-changes-type.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-reference-changes-type.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-reference-changes-type.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-reference-changes-type.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-reference-changes-type.js b/compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-reference-changes-type.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/_bug.capturing-reference-changes-type.js
rename to compiler/forget/src/__tests__/fixtures/compiler/_bug.capturing-reference-changes-type.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-computed-load.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/alias-computed-load.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-computed-load.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-computed-load.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-computed-load.js b/compiler/forget/src/__tests__/fixtures/compiler/alias-computed-load.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-computed-load.js
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-computed-load.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.js b/compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-nested-member-path.js
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-nested-member-path.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/alias-while.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-while.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-while.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/alias-while.js b/compiler/forget/src/__tests__/fixtures/compiler/alias-while.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/alias-while.js
rename to compiler/forget/src/__tests__/fixtures/compiler/alias-while.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep-nested-scope.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep-nested-scope.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep-nested-scope.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep-nested-scope.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep-nested-scope.js b/compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep-nested-scope.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep-nested-scope.js
rename to compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep-nested-scope.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep.js b/compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/allocating-primitive-as-dep.js
rename to compiler/forget/src/__tests__/fixtures/compiler/allocating-primitive-as-dep.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/array-access-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/array-access-assignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/array-access-assignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/array-access-assignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/array-access-assignment.js b/compiler/forget/src/__tests__/fixtures/compiler/array-access-assignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/array-access-assignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/array-access-assignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/array-expression-spread.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/array-expression-spread.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/array-expression-spread.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/array-expression-spread.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/array-expression-spread.js b/compiler/forget/src/__tests__/fixtures/compiler/array-expression-spread.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/array-expression-spread.js
rename to compiler/forget/src/__tests__/fixtures/compiler/array-expression-spread.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-expression-computed.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-computed.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-expression-computed.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-computed.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-expression-computed.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-computed.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-expression-computed.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-computed.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-expression-nested-path.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-nested-path.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-expression-nested-path.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-nested-path.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-expression-nested-path.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-nested-path.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-expression-nested-path.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-expression-nested-path.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-in-nested-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-in-nested-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-in-nested-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-in-nested-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-in-nested-if.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-in-nested-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-in-nested-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-in-nested-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue-array.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue-array.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue-array.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue-array.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue-array.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue-array.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue-array.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue-array.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations-complex-lvalue.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations-complex-lvalue.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/assignment-variations.js b/compiler/forget/src/__tests__/fixtures/compiler/assignment-variations.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/assignment-variations.js
rename to compiler/forget/src/__tests__/fixtures/compiler/assignment-variations.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/bug_object-pattern.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/bug_object-pattern.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/bug_object-pattern.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/bug_object-pattern.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/bug_object-pattern.js b/compiler/forget/src/__tests__/fixtures/compiler/bug_object-pattern.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/bug_object-pattern.js
rename to compiler/forget/src/__tests__/fixtures/compiler/bug_object-pattern.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/call.js b/compiler/forget/src/__tests__/fixtures/compiler/call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-func-passed-to-jsx.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capture-func-passed-to-jsx.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-func-passed-to-jsx.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-func-passed-to-jsx.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-func-passed-to-jsx.js b/compiler/forget/src/__tests__/fixtures/compiler/capture-func-passed-to-jsx.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-func-passed-to-jsx.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-func-passed-to-jsx.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-indirect-mutate-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capture-indirect-mutate-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-indirect-mutate-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-indirect-mutate-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-indirect-mutate-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/capture-indirect-mutate-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-indirect-mutate-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-indirect-mutate-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-param-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capture-param-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-param-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-param-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture-param-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capture-param-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture-param-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capture-param-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture_mutate-across-fns.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capture_mutate-across-fns.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture_mutate-across-fns.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capture_mutate-across-fns.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capture_mutate-across-fns.js b/compiler/forget/src/__tests__/fixtures/compiler/capture_mutate-across-fns.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capture_mutate-across-fns.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capture_mutate-across-fns.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-arrow-function-1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-arrow-function-1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-arrow-function-1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-arrow-function-1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-arrow-function-1.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-arrow-function-1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-arrow-function-1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-arrow-function-1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-2.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-arr-2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-arr-2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-arr-2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-arr-2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-arr-2.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-arr-2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-fun-alias-captured-mutate-arr-2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-fun-alias-captured-mutate-arr-2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate-arr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate-arr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate-arr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate-arr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate-arr.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate-arr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate-arr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate-arr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-captured-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-captured-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-computed-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-computed-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-computed-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-computed-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-computed-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-computed-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-computed-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-computed-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-computed-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-computed-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-computed-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-computed-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-computed-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-computed-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-computed-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-computed-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-alias-receiver-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-alias-receiver-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-2.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-3.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-3.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-3.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-3.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-3.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-3.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-3.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-3.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-nested.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-nested.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-nested.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-nested.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-nested.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-nested.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate-nested.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate-nested.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-simple-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-simple-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-simple-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-simple-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-func-simple-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-func-simple-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-func-simple-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-func-simple-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-1.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-capture-ref-before-rename.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-capture-ref-before-rename.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-capture-ref-before-rename.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-capture-ref-before-rename.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-capture-ref-before-rename.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-capture-ref-before-rename.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-capture-ref-before-rename.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-capture-ref-before-rename.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-conditional-capture-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-conditional-capture-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-conditional-capture-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-conditional-capture-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-conditional-capture-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-conditional-capture-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-conditional-capture-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-conditional-capture-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-member-expr-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-member-expr-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-member-expr-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-member-expr-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-member-expr-call.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-member-expr-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-member-expr-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-member-expr-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-runs-inference.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-runs-inference.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-runs-inference.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-runs-inference.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-runs-inference.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-runs-inference.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-runs-inference.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-runs-inference.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-shadow-captured.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-shadow-captured.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-shadow-captured.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-shadow-captured.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-shadow-captured.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-shadow-captured.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-shadow-captured.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-shadow-captured.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-within-block.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-within-block.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-within-block.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-within-block.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-function-within-block.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-function-within-block.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-function-within-block.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-function-within-block.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-member-expr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-member-expr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-member-expr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-member-expr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-member-expr.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-member-expr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-member-expr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-member-expr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-call.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr-in-nested-func.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr-in-nested-func.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr-in-nested-func.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr-in-nested-func.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr-in-nested-func.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr-in-nested-func.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr-in-nested-func.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr-in-nested-func.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-nested-member-expr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-nested-member-expr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-block.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-block.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-block.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-block.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-block.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-block.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-block.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-block.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-function.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-function.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-function.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-function.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-function.js b/compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-function.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/capturing-variable-in-nested-function.js
rename to compiler/forget/src/__tests__/fixtures/compiler/capturing-variable-in-nested-function.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/chained-assignment-expressions.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/chained-assignment-expressions.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/chained-assignment-expressions.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/chained-assignment-expressions.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/chained-assignment-expressions.js b/compiler/forget/src/__tests__/fixtures/compiler/chained-assignment-expressions.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/chained-assignment-expressions.js
rename to compiler/forget/src/__tests__/fixtures/compiler/chained-assignment-expressions.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/complex-while.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/complex-while.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/complex-while.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/complex-while.js b/compiler/forget/src/__tests__/fixtures/compiler/complex-while.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/complex-while.js
rename to compiler/forget/src/__tests__/fixtures/compiler/complex-while.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/component.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/component.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/component.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/component.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/component.js b/compiler/forget/src/__tests__/fixtures/compiler/component.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/component.js
rename to compiler/forget/src/__tests__/fixtures/compiler/component.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/computed-store-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/computed-store-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/computed-store-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/computed-store-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/computed-store-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/computed-store-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/computed-store-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/computed-store-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/concise-arrow-expr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/concise-arrow-expr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/concise-arrow-expr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/concise-arrow-expr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/concise-arrow-expr.js b/compiler/forget/src/__tests__/fixtures/compiler/concise-arrow-expr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/concise-arrow-expr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/concise-arrow-expr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/conditional-break.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/conditional-break.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/conditional-break.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-break.js b/compiler/forget/src/__tests__/fixtures/compiler/conditional-break.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/conditional-break.js
rename to compiler/forget/src/__tests__/fixtures/compiler/conditional-break.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/conditional-on-mutable.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/conditional-on-mutable.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.js b/compiler/forget/src/__tests__/fixtures/compiler/conditional-on-mutable.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/conditional-on-mutable.js
rename to compiler/forget/src/__tests__/fixtures/compiler/conditional-on-mutable.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-computed.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constant-computed.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-computed.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-computed.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-computed.js b/compiler/forget/src/__tests__/fixtures/compiler/constant-computed.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-computed.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-computed.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-for.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-for.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-for.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-for.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-for.js b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-for.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-for.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-for.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-phi.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-phi.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-phi.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-phi.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-phi.js b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-phi.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-phi.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-phi.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-while.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-while.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-while.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-while.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation-while.js b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-while.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation-while.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation-while.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constant-propagation.js b/compiler/forget/src/__tests__/fixtures/compiler/constant-propagation.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constant-propagation.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constant-propagation.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/constructor.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constructor.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/constructor.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/constructor.js b/compiler/forget/src/__tests__/fixtures/compiler/constructor.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/constructor.js
rename to compiler/forget/src/__tests__/fixtures/compiler/constructor.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/controlled-input.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/controlled-input.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/controlled-input.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/controlled-input.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/controlled-input.js b/compiler/forget/src/__tests__/fixtures/compiler/controlled-input.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/controlled-input.js
rename to compiler/forget/src/__tests__/fixtures/compiler/controlled-input.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dce-loop.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/dce-loop.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dce-loop.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/dce-loop.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dce-loop.js b/compiler/forget/src/__tests__/fixtures/compiler/dce-loop.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dce-loop.js
rename to compiler/forget/src/__tests__/fixtures/compiler/dce-loop.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/delete-computed-property.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/delete-computed-property.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/delete-computed-property.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/delete-computed-property.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/delete-computed-property.js b/compiler/forget/src/__tests__/fixtures/compiler/delete-computed-property.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/delete-computed-property.js
rename to compiler/forget/src/__tests__/fixtures/compiler/delete-computed-property.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/delete-property.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/delete-property.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/delete-property.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/delete-property.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/delete-property.js b/compiler/forget/src/__tests__/fixtures/compiler/delete-property.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/delete-property.js
rename to compiler/forget/src/__tests__/fixtures/compiler/delete-property.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/dependencies-outputs.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/dependencies-outputs.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.js b/compiler/forget/src/__tests__/fixtures/compiler/dependencies-outputs.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dependencies-outputs.js
rename to compiler/forget/src/__tests__/fixtures/compiler/dependencies-outputs.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/dependencies.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dependencies.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/dependencies.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/dependencies.js b/compiler/forget/src/__tests__/fixtures/compiler/dependencies.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/dependencies.js
rename to compiler/forget/src/__tests__/fixtures/compiler/dependencies.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructure-capture-global.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/destructure-capture-global.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructure-capture-global.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/destructure-capture-global.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructure-capture-global.js b/compiler/forget/src/__tests__/fixtures/compiler/destructure-capture-global.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructure-capture-global.js
rename to compiler/forget/src/__tests__/fixtures/compiler/destructure-capture-global.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructure-direct-reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/destructure-direct-reassignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructure-direct-reassignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/destructure-direct-reassignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructure-direct-reassignment.js b/compiler/forget/src/__tests__/fixtures/compiler/destructure-direct-reassignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructure-direct-reassignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/destructure-direct-reassignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructuring-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/destructuring-assignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructuring-assignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/destructuring-assignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructuring-assignment.js b/compiler/forget/src/__tests__/fixtures/compiler/destructuring-assignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructuring-assignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/destructuring-assignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructuring.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/destructuring.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructuring.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/destructuring.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/destructuring.js b/compiler/forget/src/__tests__/fixtures/compiler/destructuring.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/destructuring.js
rename to compiler/forget/src/__tests__/fixtures/compiler/destructuring.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-break.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-break.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-break.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-break.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-break.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-break.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-break.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-break.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-compound-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-compound-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-compound-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-compound-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-compound-test.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-compound-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-compound-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-compound-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-conditional-break.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-conditional-break.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-conditional-break.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-conditional-break.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-conditional-break.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-conditional-break.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-conditional-break.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-conditional-break.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-continue.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-continue.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-continue.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-continue.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-continue.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-continue.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-continue.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-continue.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-early-unconditional-break.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-early-unconditional-break.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-early-unconditional-break.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-early-unconditional-break.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-early-unconditional-break.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-early-unconditional-break.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-early-unconditional-break.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-early-unconditional-break.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-simple.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/do-while-simple.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-simple.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-simple.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/do-while-simple.js b/compiler/forget/src/__tests__/fixtures/compiler/do-while-simple.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/do-while-simple.js
rename to compiler/forget/src/__tests__/fixtures/compiler/do-while-simple.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/early-return.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/early-return.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/early-return.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/early-return.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/early-return.js b/compiler/forget/src/__tests__/fixtures/compiler/early-return.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/early-return.js
rename to compiler/forget/src/__tests__/fixtures/compiler/early-return.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.conditional-break-labeled.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.conditional-break-labeled.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.conditional-break-labeled.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.conditional-break-labeled.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.conditional-break-labeled.js b/compiler/forget/src/__tests__/fixtures/compiler/error.conditional-break-labeled.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.conditional-break-labeled.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.conditional-break-labeled.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.inverted-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.inverted-if-else.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.inverted-if-else.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.inverted-if-else.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.inverted-if-else.js b/compiler/forget/src/__tests__/fixtures/compiler/error.inverted-if-else.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.inverted-if-else.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.inverted-if-else.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.mutate-captured-arg-separately.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.mutate-captured-arg-separately.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.mutate-captured-arg-separately.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.mutate-captured-arg-separately.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.mutate-captured-arg-separately.js b/compiler/forget/src/__tests__/fixtures/compiler/error.mutate-captured-arg-separately.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.mutate-captured-arg-separately.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.mutate-captured-arg-separately.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.ssa-for-of.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.ssa-for-of.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.ssa-for-of.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.ssa-for-of.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.ssa-for-of.js b/compiler/forget/src/__tests__/fixtures/compiler/error.ssa-for-of.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.ssa-for-of.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.ssa-for-of.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.todo-kitchensink.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.todo-kitchensink.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.todo-kitchensink.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.todo-kitchensink.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.todo-kitchensink.js b/compiler/forget/src/__tests__/fixtures/compiler/error.todo-kitchensink.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.todo-kitchensink.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.todo-kitchensink.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.while-with-assignment-in-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.while-with-assignment-in-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.while-with-assignment-in-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/error.while-with-assignment-in-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/error.while-with-assignment-in-test.js b/compiler/forget/src/__tests__/fixtures/compiler/error.while-with-assignment-in-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/error.while-with-assignment-in-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/error.while-with-assignment-in-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-destructured-rest-element.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-destructured-rest-element.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-destructured-rest-element.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-destructured-rest-element.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-destructured-rest-element.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-destructured-rest-element.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-destructured-rest-element.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-destructured-rest-element.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-jsx-child.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-jsx-child.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-jsx-child.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-jsx-child.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-jsx-child.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-jsx-child.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-jsx-child.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-jsx-child.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-logical.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-logical.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-logical.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-logical.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-logical.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-logical.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-logical.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-logical.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-dependency.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-dependency.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-dependency.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-dependency.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-dependency.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-dependency.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-dependency.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-dependency.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-allocating-nested-dependency.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-primitive-dependency.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-primitive-dependency.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-primitive-dependency.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-primitive-dependency.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-primitive-dependency.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-primitive-dependency.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-non-escaping-interleaved-primitive-dependency.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-non-escaping-interleaved-primitive-dependency.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-conditional-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-conditional-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-conditional-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-conditional-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-conditional-test.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-conditional-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-conditional-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-conditional-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-if-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-if-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-if-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-if-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-if-test.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-if-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-if-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-if-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-case.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-case.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-case.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-case.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-case.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-case.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-case.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-case.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-test.js b/compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/escape-analysis-not-switch-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/escape-analysis-not-switch-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment-dynamic.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment-dynamic.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment-dynamic.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment-dynamic.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment-dynamic.js b/compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment-dynamic.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment-dynamic.js
rename to compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment-dynamic.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment.js b/compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/expression-with-assignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/expression-with-assignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/extend-scopes-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/extend-scopes-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.js b/compiler/forget/src/__tests__/fixtures/compiler/extend-scopes-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/extend-scopes-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/extend-scopes-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/for-logical.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/for-logical.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/for-logical.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/for-logical.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/for-logical.js b/compiler/forget/src/__tests__/fixtures/compiler/for-logical.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/for-logical.js
rename to compiler/forget/src/__tests__/fixtures/compiler/for-logical.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/frozen-after-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/frozen-after-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/frozen-after-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/frozen-after-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/frozen-after-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-default-function.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-default-function.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-default-function.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-default-function.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-default-function.js b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-default-function.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-default-function.js
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-default-function.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function-and-default.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function-and-default.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function-and-default.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function-and-default.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function-and-default.js b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function-and-default.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function-and-default.js
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function-and-default.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function.js b/compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test-export-function.js
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test-export-function.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/gating-test.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/gating-test.js b/compiler/forget/src/__tests__/fixtures/compiler/gating-test.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/gating-test.js
rename to compiler/forget/src/__tests__/fixtures/compiler/gating-test.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/hook-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hook-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/hook-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hook-call.js b/compiler/forget/src/__tests__/fixtures/compiler/hook-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hook-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/hook-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-arguments.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-arguments.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.js b/compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-arguments.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-arguments.js
rename to compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-arguments.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-possibly-mutable-arguments.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-possibly-mutable-arguments.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.js b/compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-possibly-mutable-arguments.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/hooks-freeze-possibly-mutable-arguments.js
rename to compiler/forget/src/__tests__/fixtures/compiler/hooks-freeze-possibly-mutable-arguments.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-class.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-class.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-class.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-class.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-class.js b/compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-class.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-class.js
rename to compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-class.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-lambda.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-lambda.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-lambda.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-lambda.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-lambda.js b/compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-lambda.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inadvertent-mutability-readonly-lambda.js
rename to compiler/forget/src/__tests__/fixtures/compiler/inadvertent-mutability-readonly-lambda.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/independent-across-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independent-across-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/independent-across-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent-across-if.js b/compiler/forget/src/__tests__/fixtures/compiler/independent-across-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independent-across-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/independent-across-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/independent.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independent.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/independent.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independent.js b/compiler/forget/src/__tests__/fixtures/compiler/independent.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independent.js
rename to compiler/forget/src/__tests__/fixtures/compiler/independent.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independently-memoize-object-property.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/independently-memoize-object-property.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independently-memoize-object-property.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/independently-memoize-object-property.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/independently-memoize-object-property.js b/compiler/forget/src/__tests__/fixtures/compiler/independently-memoize-object-property.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/independently-memoize-object-property.js
rename to compiler/forget/src/__tests__/fixtures/compiler/independently-memoize-object-property.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/infer-phi-primitive.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/infer-phi-primitive.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/infer-phi-primitive.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/infer-phi-primitive.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/infer-phi-primitive.js b/compiler/forget/src/__tests__/fixtures/compiler/infer-phi-primitive.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/infer-phi-primitive.js
rename to compiler/forget/src/__tests__/fixtures/compiler/infer-phi-primitive.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/interdependent-across-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/interdependent-across-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.js b/compiler/forget/src/__tests__/fixtures/compiler/interdependent-across-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/interdependent-across-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/interdependent-across-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/interdependent.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/interdependent.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/interdependent.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/interdependent.js b/compiler/forget/src/__tests__/fixtures/compiler/interdependent.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/interdependent.js
rename to compiler/forget/src/__tests__/fixtures/compiler/interdependent.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/inverted-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inverted-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/inverted-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/inverted-if.js b/compiler/forget/src/__tests__/fixtures/compiler/inverted-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/inverted-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/inverted-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/issue852.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/issue852.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/issue852.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue852.js b/compiler/forget/src/__tests__/fixtures/compiler/issue852.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/issue852.js
rename to compiler/forget/src/__tests__/fixtures/compiler/issue852.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue933-disjoint-set-infinite-loop.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/issue933-disjoint-set-infinite-loop.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/issue933-disjoint-set-infinite-loop.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/issue933-disjoint-set-infinite-loop.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/issue933-disjoint-set-infinite-loop.js b/compiler/forget/src/__tests__/fixtures/compiler/issue933-disjoint-set-infinite-loop.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/issue933-disjoint-set-infinite-loop.js
rename to compiler/forget/src/__tests__/fixtures/compiler/issue933-disjoint-set-infinite-loop.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/jsx-fragment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/jsx-fragment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.js b/compiler/forget/src/__tests__/fixtures/compiler/jsx-fragment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/jsx-fragment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/jsx-fragment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/jsx-spread.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/jsx-spread.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/jsx-spread.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/jsx-spread.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/jsx-spread.js b/compiler/forget/src/__tests__/fixtures/compiler/jsx-spread.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/jsx-spread.js
rename to compiler/forget/src/__tests__/fixtures/compiler/jsx-spread.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/logical-expression-object.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/logical-expression-object.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/logical-expression-object.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/logical-expression-object.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/logical-expression-object.js b/compiler/forget/src/__tests__/fixtures/compiler/logical-expression-object.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/logical-expression-object.js
rename to compiler/forget/src/__tests__/fixtures/compiler/logical-expression-object.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/logical-expression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/logical-expression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/logical-expression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/logical-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/logical-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/logical-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/logical-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call-computed.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/method-call-computed.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call-computed.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call-computed.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call-computed.js b/compiler/forget/src/__tests__/fixtures/compiler/method-call-computed.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call-computed.js
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call-computed.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call-fn-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/method-call-fn-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call-fn-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call-fn-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call-fn-call.js b/compiler/forget/src/__tests__/fixtures/compiler/method-call-fn-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call-fn-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call-fn-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/method-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/method-call.js b/compiler/forget/src/__tests__/fixtures/compiler/method-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/method-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/method-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-loops.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-loops.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.js b/compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-loops.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-loops.js
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-loops.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-with-aliasing.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-with-aliasing.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.js b/compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-with-aliasing.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-lifetime-with-aliasing.js
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-lifetime-with-aliasing.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/mutable-liverange-loop.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-liverange-loop.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.js b/compiler/forget/src/__tests__/fixtures/compiler/mutable-liverange-loop.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/mutable-liverange-loop.js
rename to compiler/forget/src/__tests__/fixtures/compiler/mutable-liverange-loop.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/nested-scopes-hook-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/nested-scopes-hook-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/nested-scopes-hook-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/nested-scopes-hook-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/nested-scopes-hook-call.js b/compiler/forget/src/__tests__/fixtures/compiler/nested-scopes-hook-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/nested-scopes-hook-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/nested-scopes-hook-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-literal-cached-in-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/obj-literal-cached-in-if-else.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-literal-cached-in-if-else.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-literal-cached-in-if-else.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-literal-cached-in-if-else.js b/compiler/forget/src/__tests__/fixtures/compiler/obj-literal-cached-in-if-else.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-literal-cached-in-if-else.js
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-literal-cached-in-if-else.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-literal-mutated-after-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/obj-literal-mutated-after-if-else.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-literal-mutated-after-if-else.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-literal-mutated-after-if-else.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-literal-mutated-after-if-else.js b/compiler/forget/src/__tests__/fixtures/compiler/obj-literal-mutated-after-if-else.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-literal-mutated-after-if-else.js
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-literal-mutated-after-if-else.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else-with-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else-with-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else-with-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else-with-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else-with-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else-with-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else-with-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else-with-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else.js b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-if-else.js
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-if-else.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-nested-if-else-with-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-nested-if-else-with-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-nested-if-else-with-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-nested-if-else-with-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-nested-if-else-with-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-nested-if-else-with-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/obj-mutated-after-nested-if-else-with-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/obj-mutated-after-nested-if-else-with-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-computed-access-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/object-computed-access-assignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-computed-access-assignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/object-computed-access-assignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-computed-access-assignment.js b/compiler/forget/src/__tests__/fixtures/compiler/object-computed-access-assignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-computed-access-assignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/object-computed-access-assignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-expression-string-literal-key.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/object-expression-string-literal-key.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-expression-string-literal-key.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/object-expression-string-literal-key.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-expression-string-literal-key.js b/compiler/forget/src/__tests__/fixtures/compiler/object-expression-string-literal-key.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-expression-string-literal-key.js
rename to compiler/forget/src/__tests__/fixtures/compiler/object-expression-string-literal-key.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-literal-spread-element.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/object-literal-spread-element.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-literal-spread-element.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/object-literal-spread-element.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-literal-spread-element.js b/compiler/forget/src/__tests__/fixtures/compiler/object-literal-spread-element.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-literal-spread-element.js
rename to compiler/forget/src/__tests__/fixtures/compiler/object-literal-spread-element.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-pattern-params.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/object-pattern-params.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-pattern-params.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/object-pattern-params.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-pattern-params.js b/compiler/forget/src/__tests__/fixtures/compiler/object-pattern-params.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-pattern-params.js
rename to compiler/forget/src/__tests__/fixtures/compiler/object-pattern-params.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-properties.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/object-properties.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-properties.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/object-properties.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/object-properties.js b/compiler/forget/src/__tests__/fixtures/compiler/object-properties.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/object-properties.js
rename to compiler/forget/src/__tests__/fixtures/compiler/object-properties.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/optional-member-expression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/optional-member-expression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/optional-member-expression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/optional-member-expression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/optional-member-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/optional-member-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/optional-member-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/optional-member-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved-by-terminal.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved-by-terminal.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved-by-terminal.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved-by-terminal.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved-by-terminal.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved-by-terminal.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved-by-terminal.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved-by-terminal.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-interleaved.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-interleaved.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowed.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowed.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowed.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowed.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowed.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowing-within-block.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowing-within-block.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowing-within-block.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowing-within-block.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowing-within-block.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowing-within-block.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-shadowing-within-block.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-shadowing-within-block.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-while.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-while.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-while.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-while.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-while.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-within-block.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-within-block.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.js b/compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-within-block.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/overlapping-scopes-within-block.js
rename to compiler/forget/src/__tests__/fixtures/compiler/overlapping-scopes-within-block.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-alias-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/primitive-alias-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-alias-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-alias-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-alias-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/primitive-alias-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-alias-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-alias-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep-nested-scope.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep-nested-scope.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep-nested-scope.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep-nested-scope.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep-nested-scope.js b/compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep-nested-scope.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep-nested-scope.js
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep-nested-scope.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep.js b/compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/primitive-as-dep.js
rename to compiler/forget/src/__tests__/fixtures/compiler/primitive-as-dep.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/prop-capturing-function-1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/prop-capturing-function-1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/prop-capturing-function-1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/prop-capturing-function-1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/prop-capturing-function-1.js b/compiler/forget/src/__tests__/fixtures/compiler/prop-capturing-function-1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/prop-capturing-function-1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/prop-capturing-function-1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/property-assignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/property-assignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/property-assignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/property-assignment.js b/compiler/forget/src/__tests__/fixtures/compiler/property-assignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/property-assignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/property-assignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scope-grouping.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scope-grouping.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.js b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scope-grouping.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scope-grouping.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scope-grouping.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.js b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scopes-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.js b/compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reactive-scopes.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reactive-scopes.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reassignment-conditional.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment-conditional.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.js b/compiler/forget/src/__tests__/fixtures/compiler/reassignment-conditional.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment-conditional.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment-conditional.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reassignment-separate-scopes.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment-separate-scopes.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.js b/compiler/forget/src/__tests__/fixtures/compiler/reassignment-separate-scopes.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment-separate-scopes.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment-separate-scopes.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reassignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reassignment.js b/compiler/forget/src/__tests__/fixtures/compiler/reassignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reassignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reassignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-condexpr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-condexpr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-condexpr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-condexpr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-condexpr.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-condexpr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-condexpr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-condexpr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-ifelse.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-ifelse.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-ifelse.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-ifelse.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-ifelse.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-ifelse.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-ifelse.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-ifelse.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse-missing.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-nested-ifelse.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-nested-ifelse.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-case.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-case.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-case.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-case.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-case.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-case.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-case.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-case.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-default.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-default.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-default.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-default.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-default.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-default.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch-missing-default.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch-missing-default.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-cfg-switch.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-cfg-switch.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-no-uncond.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-no-uncond.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-no-uncond.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-no-uncond.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-no-uncond.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-no-uncond.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-no-uncond.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-no-uncond.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-promote-uncond.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-promote-uncond.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-promote-uncond.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-promote-uncond.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-promote-uncond.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-promote-uncond.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-promote-uncond.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-promote-uncond.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order1.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order2.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-subpath-order2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-subpath-order2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order1.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order2.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-cond-deps-superpath-order2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-cond-deps-superpath-order2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-cond-scope.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-cond-scope.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-cond-scope.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-cond-scope.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-cond-scope.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-cond-scope.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-cond-scope.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-cond-scope.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-join-uncond-scopes-cond-deps.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-join-uncond-scopes-cond-deps.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-join-uncond-scopes-cond-deps.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-deps-join-uncond-scopes-cond-deps.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-deps-join-uncond-scopes-cond-deps.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-descendant.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-descendant.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-descendant.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-descendant.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-descendant.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-descendant.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-descendant.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-descendant.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-direct.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-direct.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-direct.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-direct.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-direct.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-direct.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-nonoverlap-direct.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-nonoverlap-direct.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-descendant.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-descendant.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-descendant.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-descendant.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-descendant.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-descendant.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-descendant.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-descendant.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-direct.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-direct.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-direct.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-direct.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-direct.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-direct.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-overlap-direct.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-overlap-direct.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order1.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order2.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order3.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order3.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order3.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order3.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order3.js b/compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order3.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reduce-reactive-uncond-deps-subpath-order3.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reduce-reactive-uncond-deps-subpath-order3.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/return-conditional.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/return-conditional.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/return-conditional.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/return-conditional.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/return-conditional.js b/compiler/forget/src/__tests__/fixtures/compiler/return-conditional.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/return-conditional.js
rename to compiler/forget/src/__tests__/fixtures/compiler/return-conditional.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/reverse-postorder.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/reverse-postorder.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.js b/compiler/forget/src/__tests__/fixtures/compiler/reverse-postorder.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/reverse-postorder.js
rename to compiler/forget/src/__tests__/fixtures/compiler/reverse-postorder.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare-maybe-frozen.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare-maybe-frozen.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare-maybe-frozen.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare-maybe-frozen.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare-maybe-frozen.js b/compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare-maybe-frozen.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare-maybe-frozen.js
rename to compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare-maybe-frozen.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare.js b/compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/same-variable-as-dep-and-redeclare.js
rename to compiler/forget/src/__tests__/fixtures/compiler/same-variable-as-dep-and-redeclare.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/sequence-expression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/sequence-expression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/sequence-expression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/sequence-expression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/sequence-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/sequence-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/sequence-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/sequence-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/simple-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/simple-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-function-1.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/simple-function-1.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-function-1.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-function-1.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-function-1.js b/compiler/forget/src/__tests__/fixtures/compiler/simple-function-1.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-function-1.js
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-function-1.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-scope.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/simple-scope.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-scope.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-scope.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple-scope.js b/compiler/forget/src/__tests__/fixtures/compiler/simple-scope.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple-scope.js
rename to compiler/forget/src/__tests__/fixtures/compiler/simple-scope.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/simple.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/simple.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/simple.js b/compiler/forget/src/__tests__/fixtures/compiler/simple.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/simple.js
rename to compiler/forget/src/__tests__/fixtures/compiler/simple.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-arrayexpression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-arrayexpression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-arrayexpression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-arrayexpression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-arrayexpression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx-2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx-2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx-2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx-2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx-2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-call-jsx.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-call-jsx.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-cascading-eliminated-phis.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-cascading-eliminated-phis.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-cascading-eliminated-phis.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-cascading-eliminated-phis.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-cascading-eliminated-phis.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-cascading-eliminated-phis.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-cascading-eliminated-phis.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-cascading-eliminated-phis.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-complex-multiple-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-multiple-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-complex-multiple-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-multiple-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-complex-multiple-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-multiple-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-complex-multiple-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-multiple-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-complex-single-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-single-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-complex-single-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-single-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-complex-single-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-single-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-complex-single-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-complex-single-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-for-trivial-update.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-for-trivial-update.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-for-trivial-update.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-for-trivial-update.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-for-trivial-update.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-for.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-for.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-for.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-for.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-for.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-for.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-for.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-if-else.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-if-else.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-if-else.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-if-else.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-if-else.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-leave-case.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-leave-case.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-leave-case.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-leave-case.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-leave-case.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-leave-case.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-leave-case.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-leave-case.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-multiple-phis.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-multiple-phis.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-multiple-phis.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-multiple-phis.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-multiple-phis.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-loops-no-reassign.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-loops-no-reassign.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-loops-no-reassign.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-loops-no-reassign.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-loops-no-reassign.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-phi.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-phi.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-phi.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-phi.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-phi.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-reassignment.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-reassignment.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-reassignment.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-nested-partial-reassignment.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-nested-partial-reassignment.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-newexpression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-newexpression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-newexpression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-newexpression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-newexpression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-non-empty-initializer.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-non-empty-initializer.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-non-empty-initializer.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-non-empty-initializer.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-non-empty-initializer.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-non-empty-initializer.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-non-empty-initializer.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-non-empty-initializer.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression-phi.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression-phi.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression-phi.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression-phi.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression-phi.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-objectexpression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-objectexpression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-alias-mutate-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-alias-mutate-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-alias-mutate-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-alias-mutate-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-alias-mutate-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-inside-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-inside-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-inside-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate-inside-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate-inside-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-alias-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-alias-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-2.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-2.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-2.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-2.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-2.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-alias.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-alias.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-alias.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate-alias.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate-alias.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property-mutate.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property-mutate.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-property.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-property.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-property.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-property.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-reassign.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-reassign.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-reassign.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-reassign.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-reassign.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring-with-mutation.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring-with-mutation.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring-with-mutation.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring-with-mutation.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring-with-mutation.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring-with-mutation.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring-with-mutation.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring-with-mutation.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-via-destructuring.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-via-destructuring.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-with-mutation.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-with-mutation.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-with-mutation.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-with-mutation.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-with-mutation.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-with-mutation.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming-with-mutation.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming-with-mutation.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-renaming.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-renaming.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-renaming.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-return.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-return.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-return.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-return.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-return.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-return.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-return.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-shadowing.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-shadowing.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-shadowing.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-shadowing.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-shadowing.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-sibling-phis.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-sibling-phis.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-sibling-phis.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-sibling-phis.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-sibling-phis.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-simple-phi.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-simple-phi.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-simple-phi.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-simple-phi.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-simple-phi.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-simple.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-simple.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-simple.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-simple.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-simple.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-simple.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-simple.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-single-if.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-single-if.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-single-if.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-single-if.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-single-if.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-switch.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-switch.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-switch.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-switch.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-switch.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-switch.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-switch.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-throw.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-throw.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-throw.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-throw.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-throw.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-throw.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-throw.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-while-no-reassign.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-while-no-reassign.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-while-no-reassign.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-while-no-reassign.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-while-no-reassign.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ssa-while.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-while.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-while.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ssa-while.js b/compiler/forget/src/__tests__/fixtures/compiler/ssa-while.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ssa-while.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ssa-while.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/store-via-call.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/store-via-call.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/store-via-call.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/store-via-call.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/store-via-call.js b/compiler/forget/src/__tests__/fixtures/compiler/store-via-call.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/store-via-call.js
rename to compiler/forget/src/__tests__/fixtures/compiler/store-via-call.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/store-via-new.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/store-via-new.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/store-via-new.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/store-via-new.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/store-via-new.js b/compiler/forget/src/__tests__/fixtures/compiler/store-via-new.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/store-via-new.js
rename to compiler/forget/src/__tests__/fixtures/compiler/store-via-new.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch-non-final-default.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/switch-non-final-default.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch-non-final-default.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/switch-non-final-default.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch-non-final-default.js b/compiler/forget/src/__tests__/fixtures/compiler/switch-non-final-default.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch-non-final-default.js
rename to compiler/forget/src/__tests__/fixtures/compiler/switch-non-final-default.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/switch-with-fallthrough.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/switch-with-fallthrough.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.js b/compiler/forget/src/__tests__/fixtures/compiler/switch-with-fallthrough.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch-with-fallthrough.js
rename to compiler/forget/src/__tests__/fixtures/compiler/switch-with-fallthrough.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/switch.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/switch.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/switch.js b/compiler/forget/src/__tests__/fixtures/compiler/switch.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/switch.js
rename to compiler/forget/src/__tests__/fixtures/compiler/switch.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/tagged-template-in-hook.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/tagged-template-in-hook.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/tagged-template-in-hook.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/tagged-template-in-hook.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/tagged-template-in-hook.js b/compiler/forget/src/__tests__/fixtures/compiler/tagged-template-in-hook.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/tagged-template-in-hook.js
rename to compiler/forget/src/__tests__/fixtures/compiler/tagged-template-in-hook.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/tagged-template-literal.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/tagged-template-literal.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/tagged-template-literal.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/tagged-template-literal.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/tagged-template-literal.js b/compiler/forget/src/__tests__/fixtures/compiler/tagged-template-literal.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/tagged-template-literal.js
rename to compiler/forget/src/__tests__/fixtures/compiler/tagged-template-literal.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/template-literal.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/template-literal.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/template-literal.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/template-literal.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/template-literal.js b/compiler/forget/src/__tests__/fixtures/compiler/template-literal.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/template-literal.js
rename to compiler/forget/src/__tests__/fixtures/compiler/template-literal.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/temporary-at-start-of-value-block.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/temporary-at-start-of-value-block.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/temporary-at-start-of-value-block.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/temporary-at-start-of-value-block.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/temporary-at-start-of-value-block.js b/compiler/forget/src/__tests__/fixtures/compiler/temporary-at-start-of-value-block.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/temporary-at-start-of-value-block.js
rename to compiler/forget/src/__tests__/fixtures/compiler/temporary-at-start-of-value-block.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ternary-assignment-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/ternary-assignment-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ternary-assignment-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ternary-assignment-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ternary-expression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/ternary-expression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ternary-expression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/ternary-expression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/ternary-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/ternary-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/ternary-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/ternary-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/timers.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/timers.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/timers.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/timers.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/timers.js b/compiler/forget/src/__tests__/fixtures/compiler/timers.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/timers.js
rename to compiler/forget/src/__tests__/fixtures/compiler/timers.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/transitive-alias-fields.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/transitive-alias-fields.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.js b/compiler/forget/src/__tests__/fixtures/compiler/transitive-alias-fields.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/transitive-alias-fields.js
rename to compiler/forget/src/__tests__/fixtures/compiler/transitive-alias-fields.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/trivial.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/trivial.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/trivial.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/trivial.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/trivial.js b/compiler/forget/src/__tests__/fixtures/compiler/trivial.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/trivial.js
rename to compiler/forget/src/__tests__/fixtures/compiler/trivial.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-args-test-binary-operator.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-args-test-binary-operator.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.js b/compiler/forget/src/__tests__/fixtures/compiler/type-args-test-binary-operator.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-args-test-binary-operator.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-args-test-binary-operator.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-binary-operator.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-binary-operator.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.js b/compiler/forget/src/__tests__/fixtures/compiler/type-binary-operator.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-binary-operator.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-binary-operator.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-cast-expression.flow.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-cast-expression.flow.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-cast-expression.flow.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-cast-expression.flow.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-cast-expression.flow.js b/compiler/forget/src/__tests__/fixtures/compiler/type-cast-expression.flow.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-cast-expression.flow.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-cast-expression.flow.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-field-load.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-field-load.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-field-load.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-field-load.js b/compiler/forget/src/__tests__/fixtures/compiler/type-field-load.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-field-load.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-field-load.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-test-field-load-binary-op.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-field-load-binary-op.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.js b/compiler/forget/src/__tests__/fixtures/compiler/type-test-field-load-binary-op.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-field-load-binary-op.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-field-load-binary-op.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-test-field-store.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-field-store.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.js b/compiler/forget/src/__tests__/fixtures/compiler/type-test-field-store.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-field-store.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-field-store.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-test-polymorphic.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-polymorphic.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.js b/compiler/forget/src/__tests__/fixtures/compiler/type-test-polymorphic.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-polymorphic.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-polymorphic.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-test-primitive.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-primitive.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.js b/compiler/forget/src/__tests__/fixtures/compiler/type-test-primitive.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-primitive.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-primitive.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/type-test-return-type-inference.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-return-type-inference.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.js b/compiler/forget/src/__tests__/fixtures/compiler/type-test-return-type-inference.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/type-test-return-type-inference.js
rename to compiler/forget/src/__tests__/fixtures/compiler/type-test-return-type-inference.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unary-expr.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unary-expr.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unary-expr.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unary-expr.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unary-expr.js b/compiler/forget/src/__tests__/fixtures/compiler/unary-expr.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unary-expr.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unary-expr.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unconditional-break-label.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unconditional-break-label.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unconditional-break-label.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unconditional-break-label.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unconditional-break-label.js b/compiler/forget/src/__tests__/fixtures/compiler/unconditional-break-label.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unconditional-break-label.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unconditional-break-label.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-array-middle-element.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unused-array-middle-element.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-array-middle-element.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-array-middle-element.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-array-middle-element.js b/compiler/forget/src/__tests__/fixtures/compiler/unused-array-middle-element.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-array-middle-element.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-array-middle-element.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-array-rest-element.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unused-array-rest-element.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-array-rest-element.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-array-rest-element.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-array-rest-element.js b/compiler/forget/src/__tests__/fixtures/compiler/unused-array-rest-element.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-array-rest-element.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-array-rest-element.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-object-element-with-rest.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unused-object-element-with-rest.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-object-element-with-rest.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-object-element-with-rest.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-object-element-with-rest.js b/compiler/forget/src/__tests__/fixtures/compiler/unused-object-element-with-rest.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-object-element-with-rest.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-object-element-with-rest.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-object-element.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/unused-object-element.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-object-element.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-object-element.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/unused-object-element.js b/compiler/forget/src/__tests__/fixtures/compiler/unused-object-element.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/unused-object-element.js
rename to compiler/forget/src/__tests__/fixtures/compiler/unused-object-element.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/update-expression.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/update-expression.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/update-expression.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/update-expression.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/update-expression.js b/compiler/forget/src/__tests__/fixtures/compiler/update-expression.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/update-expression.js
rename to compiler/forget/src/__tests__/fixtures/compiler/update-expression.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/use-callback-simple.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/use-callback-simple.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/use-callback-simple.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/use-callback-simple.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/use-callback-simple.js b/compiler/forget/src/__tests__/fixtures/compiler/use-callback-simple.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/use-callback-simple.js
rename to compiler/forget/src/__tests__/fixtures/compiler/use-callback-simple.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useMemo-simple.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/useMemo-simple.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useMemo-simple.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/useMemo-simple.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useMemo-simple.js b/compiler/forget/src/__tests__/fixtures/compiler/useMemo-simple.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useMemo-simple.js
rename to compiler/forget/src/__tests__/fixtures/compiler/useMemo-simple.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useRef-mutable.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/useRef-mutable.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useRef-mutable.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/useRef-mutable.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useRef-mutable.js b/compiler/forget/src/__tests__/fixtures/compiler/useRef-mutable.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useRef-mutable.js
rename to compiler/forget/src/__tests__/fixtures/compiler/useRef-mutable.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useRef-rename-mutable.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/useRef-rename-mutable.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useRef-rename-mutable.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/useRef-rename-mutable.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/useRef-rename-mutable.js b/compiler/forget/src/__tests__/fixtures/compiler/useRef-rename-mutable.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/useRef-rename-mutable.js
rename to compiler/forget/src/__tests__/fixtures/compiler/useRef-rename-mutable.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/while-break.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-break.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/while-break.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-break.js b/compiler/forget/src/__tests__/fixtures/compiler/while-break.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-break.js
rename to compiler/forget/src/__tests__/fixtures/compiler/while-break.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/while-conditional-continue.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/while-conditional-continue.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.js b/compiler/forget/src/__tests__/fixtures/compiler/while-conditional-continue.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-conditional-continue.js
rename to compiler/forget/src/__tests__/fixtures/compiler/while-conditional-continue.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-logical.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/while-logical.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-logical.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/while-logical.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-logical.js b/compiler/forget/src/__tests__/fixtures/compiler/while-logical.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-logical.js
rename to compiler/forget/src/__tests__/fixtures/compiler/while-logical.js
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-property.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/while-property.expect.md
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-property.expect.md
rename to compiler/forget/src/__tests__/fixtures/compiler/while-property.expect.md
diff --git a/compiler/forget/src/__tests__/fixtures/hir/while-property.js b/compiler/forget/src/__tests__/fixtures/compiler/while-property.js
similarity index 100%
rename from compiler/forget/src/__tests__/fixtures/hir/while-property.js
rename to compiler/forget/src/__tests__/fixtures/compiler/while-property.js