diff --git a/BUILD.gn b/BUILD.gn
index d86b9d19a4..92e554e21d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -663,16 +663,26 @@ source_set("v8_base") {
     "src/assembler.h",
     "src/assert-scope.h",
     "src/assert-scope.cc",
-    "src/ast-expression-visitor.cc",
-    "src/ast-expression-visitor.h",
-    "src/ast-literal-reindexer.cc",
-    "src/ast-literal-reindexer.h",
-    "src/ast-numbering.cc",
-    "src/ast-numbering.h",
-    "src/ast-value-factory.cc",
-    "src/ast-value-factory.h",
-    "src/ast.cc",
-    "src/ast.h",
+    "src/ast/ast-expression-visitor.cc",
+    "src/ast/ast-expression-visitor.h",
+    "src/ast/ast-literal-reindexer.cc",
+    "src/ast/ast-literal-reindexer.h",
+    "src/ast/ast-numbering.cc",
+    "src/ast/ast-numbering.h",
+    "src/ast/ast-value-factory.cc",
+    "src/ast/ast-value-factory.h",
+    "src/ast/ast.cc",
+    "src/ast/ast.h",
+    "src/ast/modules.cc",
+    "src/ast/modules.h",
+    "src/ast/prettyprinter.cc",
+    "src/ast/prettyprinter.h",
+    "src/ast/scopeinfo.cc",
+    "src/ast/scopeinfo.h",
+    "src/ast/scopes.cc",
+    "src/ast/scopes.h",
+    "src/ast/variables.cc",
+    "src/ast/variables.h",
     "src/atomic-utils.h",
     "src/background-parsing-task.cc",
     "src/background-parsing-task.h",
@@ -990,7 +1000,6 @@ source_set("v8_base") {
     "src/elements.h",
     "src/execution.cc",
     "src/execution.h",
-    "src/expression-classifier.h",
     "src/extensions/externalize-string-extension.cc",
     "src/extensions/externalize-string-extension.h",
     "src/extensions/free-buffer-extension.cc",
@@ -1017,8 +1026,6 @@ source_set("v8_base") {
     "src/frames.h",
     "src/full-codegen/full-codegen.cc",
     "src/full-codegen/full-codegen.h",
-    "src/func-name-inferrer.cc",
-    "src/func-name-inferrer.h",
     "src/futex-emulation.cc",
     "src/futex-emulation.h",
     "src/gdb-jit.cc",
@@ -1105,7 +1112,6 @@ source_set("v8_base") {
     "src/isolate-inl.h",
     "src/isolate.cc",
     "src/isolate.h",
-    "src/json-parser.h",
     "src/json-stringifier.h",
     "src/key-accumulator.h",
     "src/key-accumulator.cc",
@@ -1124,8 +1130,6 @@ source_set("v8_base") {
     "src/macro-assembler.h",
     "src/messages.cc",
     "src/messages.h",
-    "src/modules.cc",
-    "src/modules.h",
     "src/msan.h",
     "src/objects-body-descriptors-inl.h",
     "src/objects-body-descriptors.h",
@@ -1138,20 +1142,30 @@ source_set("v8_base") {
     "src/optimizing-compile-dispatcher.h",
     "src/ostreams.cc",
     "src/ostreams.h",
-    "src/parameter-initializer-rewriter.cc",
-    "src/parameter-initializer-rewriter.h",
-    "src/parser.cc",
-    "src/parser.h",
-    "src/pattern-rewriter.cc",
+    "src/parsing/expression-classifier.h",
+    "src/parsing/func-name-inferrer.cc",
+    "src/parsing/func-name-inferrer.h",
+    "src/parsing/json-parser.h",
+    "src/parsing/parameter-initializer-rewriter.cc",
+    "src/parsing/parameter-initializer-rewriter.h",
+    "src/parsing/parser.cc",
+    "src/parsing/parser.h",
+    "src/parsing/pattern-rewriter.cc",
+    "src/parsing/preparse-data-format.h",
+    "src/parsing/preparse-data.cc",
+    "src/parsing/preparse-data.h",
+    "src/parsing/preparser.cc",
+    "src/parsing/preparser.h",
+    "src/parsing/rewriter.cc",
+    "src/parsing/rewriter.h",
+    "src/parsing/scanner-character-streams.cc",
+    "src/parsing/scanner-character-streams.h",
+    "src/parsing/scanner.cc",
+    "src/parsing/scanner.h",
+    "src/parsing/token.cc",
+    "src/parsing/token.h",
     "src/pending-compilation-error-handler.cc",
     "src/pending-compilation-error-handler.h",
-    "src/preparse-data-format.h",
-    "src/preparse-data.cc",
-    "src/preparse-data.h",
-    "src/preparser.cc",
-    "src/preparser.h",
-    "src/prettyprinter.cc",
-    "src/prettyprinter.h",
     "src/profiler/allocation-tracker.cc",
     "src/profiler/allocation-tracker.h",
     "src/profiler/circular-queue-inl.h",
@@ -1179,8 +1193,6 @@ source_set("v8_base") {
     "src/property.cc",
     "src/property.h",
     "src/prototype.h",
-    "src/rewriter.cc",
-    "src/rewriter.h",
     "src/regexp/bytecodes-irregexp.h",
     "src/regexp/interpreter-irregexp.cc",
     "src/regexp/interpreter-irregexp.h",
@@ -1236,14 +1248,6 @@ source_set("v8_base") {
     "src/runtime/runtime.h",
     "src/safepoint-table.cc",
     "src/safepoint-table.h",
-    "src/scanner-character-streams.cc",
-    "src/scanner-character-streams.h",
-    "src/scanner.cc",
-    "src/scanner.h",
-    "src/scopeinfo.cc",
-    "src/scopeinfo.h",
-    "src/scopes.cc",
-    "src/scopes.h",
     "src/signature.h",
     "src/simulator.h",
     "src/small-pointer-list.h",
@@ -1266,8 +1270,6 @@ source_set("v8_base") {
     "src/string-stream.h",
     "src/strtod.cc",
     "src/strtod.h",
-    "src/token.cc",
-    "src/token.h",
     "src/transitions-inl.h",
     "src/transitions.cc",
     "src/transitions.h",
@@ -1299,8 +1301,6 @@ source_set("v8_base") {
     "src/v8memory.h",
     "src/v8threads.cc",
     "src/v8threads.h",
-    "src/variables.cc",
-    "src/variables.h",
     "src/version.cc",
     "src/version.h",
     "src/vm-state-inl.h",
diff --git a/src/allocation-site-scopes.h b/src/allocation-site-scopes.h
index 96e74c5ddb..70dd63e1dd 100644
--- a/src/allocation-site-scopes.h
+++ b/src/allocation-site-scopes.h
@@ -5,7 +5,7 @@
 #ifndef V8_ALLOCATION_SITE_SCOPES_H_
 #define V8_ALLOCATION_SITE_SCOPES_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/handles.h"
 #include "src/objects.h"
 #include "src/zone.h"
diff --git a/src/api.cc b/src/api.cc
index 265af15ca1..6cdcfbedd1 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -33,9 +33,10 @@
 #include "src/global-handles.h"
 #include "src/icu_util.h"
 #include "src/isolate-inl.h"
-#include "src/json-parser.h"
 #include "src/messages.h"
-#include "src/parser.h"
+#include "src/parsing/json-parser.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/scanner-character-streams.h"
 #include "src/pending-compilation-error-handler.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/profiler/heap-profiler.h"
@@ -48,7 +49,6 @@
 #include "src/prototype.h"
 #include "src/runtime/runtime.h"
 #include "src/runtime-profiler.h"
-#include "src/scanner-character-streams.h"
 #include "src/simulator.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/snapshot.h"
diff --git a/src/arm/codegen-arm.h b/src/arm/codegen-arm.h
index f54fb71d0a..880825a1be 100644
--- a/src/arm/codegen-arm.h
+++ b/src/arm/codegen-arm.h
@@ -5,7 +5,7 @@
 #ifndef V8_ARM_CODEGEN_ARM_H_
 #define V8_ARM_CODEGEN_ARM_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/arm64/codegen-arm64.h b/src/arm64/codegen-arm64.h
index 7100ef1134..573f6fe159 100644
--- a/src/arm64/codegen-arm64.h
+++ b/src/arm64/codegen-arm64.h
@@ -5,7 +5,7 @@
 #ifndef V8_ARM64_CODEGEN_ARM64_H_
 #define V8_ARM64_CODEGEN_ARM64_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/assembler.cc b/src/assembler.cc
index 5d55fb5f4c..c1ab813466 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -51,6 +51,7 @@
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/ostreams.h"
+#include "src/parsing/token.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
@@ -59,7 +60,6 @@
 #include "src/runtime/runtime.h"
 #include "src/simulator.h"  // For flushing instruction cache.
 #include "src/snapshot/serialize.h"
-#include "src/token.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/ia32/assembler-ia32-inl.h"  // NOLINT
diff --git a/src/assembler.h b/src/assembler.h
index 6765211acc..df288f48c7 100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -38,8 +38,8 @@
 #include "src/allocation.h"
 #include "src/builtins.h"
 #include "src/isolate.h"
+#include "src/parsing/token.h"
 #include "src/runtime/runtime.h"
-#include "src/token.h"
 
 namespace v8 {
 
diff --git a/src/ast-expression-visitor.cc b/src/ast/ast-expression-visitor.cc
similarity index 99%
rename from src/ast-expression-visitor.cc
rename to src/ast/ast-expression-visitor.cc
index b24abae24f..a5e094066f 100644
--- a/src/ast-expression-visitor.cc
+++ b/src/ast/ast-expression-visitor.cc
@@ -4,11 +4,11 @@
 
 #include "src/v8.h"
 
-#include "src/ast-expression-visitor.h"
+#include "src/ast/ast-expression-visitor.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/codegen.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/ast-expression-visitor.h b/src/ast/ast-expression-visitor.h
similarity index 86%
rename from src/ast-expression-visitor.h
rename to src/ast/ast-expression-visitor.h
index a4bf34d63f..cda624d5b7 100644
--- a/src/ast-expression-visitor.h
+++ b/src/ast/ast-expression-visitor.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_AST_EXPRESSION_VISITOR_H_
-#define V8_AST_EXPRESSION_VISITOR_H_
+#ifndef V8_AST_AST_EXPRESSION_VISITOR_H_
+#define V8_AST_AST_EXPRESSION_VISITOR_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/effects.h"
-#include "src/scopes.h"
 #include "src/type-info.h"
 #include "src/types.h"
 #include "src/zone.h"
@@ -47,4 +47,4 @@ class AstExpressionVisitor : public AstVisitor {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_AST_EXPRESSION_VISITOR_H_
+#endif  // V8_AST_AST_EXPRESSION_VISITOR_H_
diff --git a/src/ast-literal-reindexer.cc b/src/ast/ast-literal-reindexer.cc
similarity index 98%
rename from src/ast-literal-reindexer.cc
rename to src/ast/ast-literal-reindexer.cc
index 5987399f97..adb0b1b729 100644
--- a/src/ast-literal-reindexer.cc
+++ b/src/ast/ast-literal-reindexer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ast-literal-reindexer.h"
+#include "src/ast/ast-literal-reindexer.h"
 
-#include "src/ast.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/ast-literal-reindexer.h b/src/ast/ast-literal-reindexer.h
similarity index 87%
rename from src/ast-literal-reindexer.h
rename to src/ast/ast-literal-reindexer.h
index 14f64f6ef1..84082fa55b 100644
--- a/src/ast-literal-reindexer.h
+++ b/src/ast/ast-literal-reindexer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_AST_LITERAL_REINDEXER
-#define V8_AST_LITERAL_REINDEXER
+#ifndef V8_AST_AST_LITERAL_REINDEXER
+#define V8_AST_AST_LITERAL_REINDEXER
 
-#include "src/ast.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
@@ -42,4 +42,4 @@ class AstLiteralReindexer final : public AstVisitor {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_AST_LITERAL_REINDEXER
+#endif  // V8_AST_AST_LITERAL_REINDEXER
diff --git a/src/ast-numbering.cc b/src/ast/ast-numbering.cc
similarity index 99%
rename from src/ast-numbering.cc
rename to src/ast/ast-numbering.cc
index 20a091f1fa..474eec6754 100644
--- a/src/ast-numbering.cc
+++ b/src/ast/ast-numbering.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ast-numbering.h"
+#include "src/ast/ast-numbering.h"
 
-#include "src/ast.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/ast-numbering.h b/src/ast/ast-numbering.h
similarity index 83%
rename from src/ast-numbering.h
rename to src/ast/ast-numbering.h
index 57c750cf64..0ac1ef2134 100644
--- a/src/ast-numbering.h
+++ b/src/ast/ast-numbering.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_AST_NUMBERING_H_
-#define V8_AST_NUMBERING_H_
+#ifndef V8_AST_AST_NUMBERING_H_
+#define V8_AST_AST_NUMBERING_H_
 
 namespace v8 {
 namespace internal {
@@ -22,4 +22,4 @@ bool Renumber(Isolate* isolate, Zone* zone, FunctionLiteral* function);
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_AST_NUMBERING_H_
+#endif  // V8_AST_AST_NUMBERING_H_
diff --git a/src/ast-value-factory.cc b/src/ast/ast-value-factory.cc
similarity index 99%
rename from src/ast-value-factory.cc
rename to src/ast/ast-value-factory.cc
index 8a4a4daf0c..2e17fbcfaf 100644
--- a/src/ast-value-factory.cc
+++ b/src/ast/ast-value-factory.cc
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
 
 #include "src/api.h"
 #include "src/objects.h"
diff --git a/src/ast-value-factory.h b/src/ast/ast-value-factory.h
similarity index 99%
rename from src/ast-value-factory.h
rename to src/ast/ast-value-factory.h
index 645b8b6631..1c2144c480 100644
--- a/src/ast-value-factory.h
+++ b/src/ast/ast-value-factory.h
@@ -25,8 +25,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef V8_AST_VALUE_FACTORY_H_
-#define V8_AST_VALUE_FACTORY_H_
+#ifndef V8_AST_AST_VALUE_FACTORY_H_
+#define V8_AST_AST_VALUE_FACTORY_H_
 
 #include "src/api.h"
 #include "src/hashmap.h"
@@ -373,4 +373,4 @@ class AstValueFactory {
 #undef STRING_CONSTANTS
 #undef OTHER_CONSTANTS
 
-#endif  // V8_AST_VALUE_FACTORY_H_
+#endif  // V8_AST_AST_VALUE_FACTORY_H_
diff --git a/src/ast.cc b/src/ast/ast.cc
similarity index 99%
rename from src/ast.cc
rename to src/ast/ast.cc
index 07a5dea062..b8ed4a287f 100644
--- a/src/ast.cc
+++ b/src/ast/ast.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 
 #include <cmath>  // For isfinite.
+#include "src/ast/scopes.h"
 #include "src/builtins.h"
 #include "src/code-stubs.h"
 #include "src/contexts.h"
 #include "src/conversions.h"
 #include "src/hashmap.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/property.h"
 #include "src/property-details.h"
-#include "src/scopes.h"
 #include "src/string-stream.h"
 #include "src/type-info.h"
 
diff --git a/src/ast.h b/src/ast/ast.h
similarity index 99%
rename from src/ast.h
rename to src/ast/ast.h
index 0be9948f95..e1adae9f24 100644
--- a/src/ast.h
+++ b/src/ast/ast.h
@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_AST_H_
-#define V8_AST_H_
+#ifndef V8_AST_AST_H_
+#define V8_AST_AST_H_
 
 #include "src/assembler.h"
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
+#include "src/ast/modules.h"
+#include "src/ast/variables.h"
 #include "src/bailout-reason.h"
 #include "src/base/flags.h"
 #include "src/base/smart-pointers.h"
 #include "src/factory.h"
 #include "src/isolate.h"
 #include "src/list.h"
-#include "src/modules.h"
+#include "src/parsing/token.h"
 #include "src/regexp/jsregexp.h"
 #include "src/runtime/runtime.h"
 #include "src/small-pointer-list.h"
-#include "src/token.h"
 #include "src/types.h"
 #include "src/utils.h"
-#include "src/variables.h"
 
 namespace v8 {
 namespace internal {
@@ -3673,4 +3673,4 @@ class AstNodeFactory final BASE_EMBEDDED {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_AST_H_
+#endif  // V8_AST_AST_H_
diff --git a/src/modules.cc b/src/ast/modules.cc
similarity index 96%
rename from src/modules.cc
rename to src/ast/modules.cc
index f72693cd66..225cd8d62c 100644
--- a/src/modules.cc
+++ b/src/ast/modules.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/modules.h"
+#include "src/ast/modules.h"
 
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/modules.h b/src/ast/modules.h
similarity index 97%
rename from src/modules.h
rename to src/ast/modules.h
index f1dbd2516a..e3c66dce94 100644
--- a/src/modules.h
+++ b/src/ast/modules.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_MODULES_H_
-#define V8_MODULES_H_
+#ifndef V8_AST_MODULES_H_
+#define V8_AST_MODULES_H_
 
 #include "src/zone.h"
 
@@ -118,4 +118,4 @@ class ModuleDescriptor : public ZoneObject {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_MODULES_H_
+#endif  // V8_AST_MODULES_H_
diff --git a/src/prettyprinter.cc b/src/ast/prettyprinter.cc
similarity index 99%
rename from src/prettyprinter.cc
rename to src/ast/prettyprinter.cc
index bcb8cb3dde..00b31168ea 100644
--- a/src/prettyprinter.cc
+++ b/src/ast/prettyprinter.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/prettyprinter.h"
+#include "src/ast/prettyprinter.h"
 
 #include <stdarg.h>
 
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
+#include "src/ast/scopes.h"
 #include "src/base/platform/platform.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/prettyprinter.h b/src/ast/prettyprinter.h
similarity index 97%
rename from src/prettyprinter.h
rename to src/ast/prettyprinter.h
index 0793d33e74..808f702c4d 100644
--- a/src/prettyprinter.h
+++ b/src/ast/prettyprinter.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PRETTYPRINTER_H_
-#define V8_PRETTYPRINTER_H_
+#ifndef V8_AST_PRETTYPRINTER_H_
+#define V8_AST_PRETTYPRINTER_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
 
 namespace v8 {
 namespace internal {
@@ -136,4 +136,4 @@ class AstPrinter: public PrettyPrinter {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_PRETTYPRINTER_H_
+#endif  // V8_AST_PRETTYPRINTER_H_
diff --git a/src/scopeinfo.cc b/src/ast/scopeinfo.cc
similarity index 99%
rename from src/scopeinfo.cc
rename to src/ast/scopeinfo.cc
index c061b8fceb..cb7409a9d2 100644
--- a/src/scopeinfo.cc
+++ b/src/ast/scopeinfo.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/scopeinfo.h"
+#include "src/ast/scopeinfo.h"
 
 #include <stdlib.h>
 
+#include "src/ast/scopes.h"
 #include "src/bootstrapper.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/scopeinfo.h b/src/ast/scopeinfo.h
similarity index 97%
rename from src/scopeinfo.h
rename to src/ast/scopeinfo.h
index 2afc667c30..489a672ed8 100644
--- a/src/scopeinfo.h
+++ b/src/ast/scopeinfo.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_SCOPEINFO_H_
-#define V8_SCOPEINFO_H_
+#ifndef V8_AST_SCOPEINFO_H_
+#define V8_AST_SCOPEINFO_H_
 
 #include "src/allocation.h"
-#include "src/modules.h"
-#include "src/variables.h"
+#include "src/ast/modules.h"
+#include "src/ast/variables.h"
 
 namespace v8 {
 namespace internal {
@@ -172,4 +172,4 @@ class ModuleInfo: public FixedArray {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_SCOPEINFO_H_
+#endif  // V8_AST_SCOPEINFO_H_
diff --git a/src/scopes.cc b/src/ast/scopes.cc
similarity index 99%
rename from src/scopes.cc
rename to src/ast/scopes.cc
index 57dcb3a9fc..1eb5b66a93 100644
--- a/src/scopes.cc
+++ b/src/ast/scopes.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/scopes.h"
+#include "src/ast/scopes.h"
 
 #include "src/accessors.h"
+#include "src/ast/scopeinfo.h"
 #include "src/bootstrapper.h"
 #include "src/messages.h"
-#include "src/parser.h"
-#include "src/scopeinfo.h"
+#include "src/parsing/parser.h"  // for ParseInfo
 
 namespace v8 {
 namespace internal {
diff --git a/src/scopes.h b/src/ast/scopes.h
similarity index 99%
rename from src/scopes.h
rename to src/ast/scopes.h
index d115097803..3ef40ecf91 100644
--- a/src/scopes.h
+++ b/src/ast/scopes.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_SCOPES_H_
-#define V8_SCOPES_H_
+#ifndef V8_AST_SCOPES_H_
+#define V8_AST_SCOPES_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/pending-compilation-error-handler.h"
 #include "src/zone.h"
 
@@ -849,4 +849,4 @@ class Scope: public ZoneObject {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_SCOPES_H_
+#endif  // V8_AST_SCOPES_H_
diff --git a/src/variables.cc b/src/ast/variables.cc
similarity index 96%
rename from src/variables.cc
rename to src/ast/variables.cc
index b8bcbd03d1..8e00782386 100644
--- a/src/variables.cc
+++ b/src/ast/variables.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/variables.h"
+#include "src/ast/variables.h"
 
-#include "src/ast.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/variables.h b/src/ast/variables.h
similarity index 98%
rename from src/variables.h
rename to src/ast/variables.h
index a9cd5dcfec..4057d2b5f6 100644
--- a/src/variables.h
+++ b/src/ast/variables.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_VARIABLES_H_
-#define V8_VARIABLES_H_
+#ifndef V8_AST_VARIABLES_H_
+#define V8_AST_VARIABLES_H_
 
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
 #include "src/zone.h"
 
 namespace v8 {
@@ -211,4 +211,4 @@ class ClassVariable : public Variable {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_VARIABLES_H_
+#endif  // V8_AST_VARIABLES_H_
diff --git a/src/background-parsing-task.h b/src/background-parsing-task.h
index c224303e05..0f290fb7f0 100644
--- a/src/background-parsing-task.h
+++ b/src/background-parsing-task.h
@@ -9,7 +9,7 @@
 #include "src/base/platform/semaphore.h"
 #include "src/base/smart-pointers.h"
 #include "src/compiler.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/bit-vector.cc b/src/bit-vector.cc
index cdd00f89c4..0fbb01811a 100644
--- a/src/bit-vector.cc
+++ b/src/bit-vector.cc
@@ -5,7 +5,6 @@
 #include "src/bit-vector.h"
 
 #include "src/base/bits.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index 028ce579d5..61db2b0b1b 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -12,7 +12,7 @@
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic.h"
 #include "src/macro-assembler.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/profiler/cpu-profiler.h"
 
 namespace v8 {
diff --git a/src/codegen.cc b/src/codegen.cc
index 5b878a9f66..a57cbb3a5e 100644
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -7,13 +7,12 @@
 #if defined(V8_OS_AIX)
 #include <fenv.h>  // NOLINT(build/c++11)
 #endif
+#include "src/ast/prettyprinter.h"
 #include "src/bootstrapper.h"
 #include "src/compiler.h"
 #include "src/debug/debug.h"
-#include "src/parser.h"
-#include "src/prettyprinter.h"
+#include "src/parsing/parser.h"
 #include "src/profiler/cpu-profiler.h"
-#include "src/rewriter.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/compiler.cc b/src/compiler.cc
index 75094d75c5..1f8af8ca99 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -6,7 +6,10 @@
 
 #include <algorithm>
 
-#include "src/ast-numbering.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/prettyprinter.h"
+#include "src/ast/scopeinfo.h"
+#include "src/ast/scopes.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
 #include "src/compilation-cache.h"
@@ -23,14 +26,11 @@
 #include "src/isolate-inl.h"
 #include "src/log-inl.h"
 #include "src/messages.h"
-#include "src/parser.h"
-#include "src/prettyprinter.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
+#include "src/parsing/scanner-character-streams.h"
 #include "src/profiler/cpu-profiler.h"
-#include "src/rewriter.h"
 #include "src/runtime-profiler.h"
-#include "src/scanner-character-streams.h"
-#include "src/scopeinfo.h"
-#include "src/scopes.h"
 #include "src/snapshot/serialize.h"
 #include "src/vm-state-inl.h"
 
diff --git a/src/compiler.h b/src/compiler.h
index 6437173513..a2e85f2626 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -6,7 +6,7 @@
 #define V8_COMPILER_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/bailout-reason.h"
 #include "src/compilation-dependencies.h"
 #include "src/signature.h"
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
index 2ba1a8a379..fd593efbd2 100644
--- a/src/compiler/arm/code-generator-arm.cc
+++ b/src/compiler/arm/code-generator-arm.cc
@@ -5,11 +5,11 @@
 #include "src/compiler/code-generator.h"
 
 #include "src/arm/macro-assembler-arm.h"
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc
index bfab1a670a..f80033e5c9 100644
--- a/src/compiler/arm64/code-generator-arm64.cc
+++ b/src/compiler/arm64/code-generator-arm64.cc
@@ -6,11 +6,11 @@
 
 #include "src/arm64/frames-arm64.h"
 #include "src/arm64/macro-assembler-arm64.h"
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/ast-graph-builder.cc b/src/compiler/ast-graph-builder.cc
index f623f666ca..8f748ccd59 100644
--- a/src/compiler/ast-graph-builder.cc
+++ b/src/compiler/ast-graph-builder.cc
@@ -4,6 +4,7 @@
 
 #include "src/compiler/ast-graph-builder.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler.h"
 #include "src/compiler/ast-loop-assignment-analyzer.h"
 #include "src/compiler/control-builders.h"
@@ -14,8 +15,7 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/operator-properties.h"
 #include "src/compiler/state-values-utils.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/ast-graph-builder.h b/src/compiler/ast-graph-builder.h
index 79bc1ce367..69051d4f04 100644
--- a/src/compiler/ast-graph-builder.h
+++ b/src/compiler/ast-graph-builder.h
@@ -5,7 +5,7 @@
 #ifndef V8_COMPILER_AST_GRAPH_BUILDER_H_
 #define V8_COMPILER_AST_GRAPH_BUILDER_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/liveness-analyzer.h"
 #include "src/compiler/state-values-utils.h"
diff --git a/src/compiler/ast-loop-assignment-analyzer.cc b/src/compiler/ast-loop-assignment-analyzer.cc
index 70c4057e59..7878d776be 100644
--- a/src/compiler/ast-loop-assignment-analyzer.cc
+++ b/src/compiler/ast-loop-assignment-analyzer.cc
@@ -4,7 +4,7 @@
 
 #include "src/compiler/ast-loop-assignment-analyzer.h"
 #include "src/compiler.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/ast-loop-assignment-analyzer.h b/src/compiler/ast-loop-assignment-analyzer.h
index d7b390009d..7bb29bbb0c 100644
--- a/src/compiler/ast-loop-assignment-analyzer.h
+++ b/src/compiler/ast-loop-assignment-analyzer.h
@@ -5,7 +5,7 @@
 #ifndef V8_COMPILER_AST_LOOP_ASSIGNMENT_ANALYZER_H_
 #define V8_COMPILER_AST_LOOP_ASSIGNMENT_ANALYZER_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/bit-vector.h"
 #include "src/zone-containers.h"
 
diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc
index 1ec79b778a..8e2de0fba6 100644
--- a/src/compiler/ia32/code-generator-ia32.cc
+++ b/src/compiler/ia32/code-generator-ia32.cc
@@ -4,6 +4,7 @@
 
 #include "src/compiler/code-generator.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
@@ -11,7 +12,6 @@
 #include "src/ia32/assembler-ia32.h"
 #include "src/ia32/frames-ia32.h"
 #include "src/ia32/macro-assembler-ia32.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index 0d8b976f45..d6f01c19ca 100644
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -4,8 +4,9 @@
 
 #include "src/compiler/js-inlining.h"
 
-#include "src/ast.h"
-#include "src/ast-numbering.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/scopes.h"
 #include "src/compiler.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/ast-graph-builder.h"
@@ -16,9 +17,8 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/operator-properties.h"
 #include "src/isolate-inl.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc
index 5c49d5c7c4..ca9763bf67 100644
--- a/src/compiler/linkage.cc
+++ b/src/compiler/linkage.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/ast/scopes.h"
 #include "src/code-stubs.h"
 #include "src/compiler.h"
 #include "src/compiler/common-operator.h"
@@ -10,7 +11,6 @@
 #include "src/compiler/node.h"
 #include "src/compiler/osr.h"
 #include "src/compiler/pipeline.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc
index 0444a6c90a..71b32abb8a 100644
--- a/src/compiler/mips/code-generator-mips.cc
+++ b/src/compiler/mips/code-generator-mips.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/mips/macro-assembler-mips.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc
index 0efd6068c2..a1ca07e143 100644
--- a/src/compiler/mips64/code-generator-mips64.cc
+++ b/src/compiler/mips64/code-generator-mips64.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/mips/macro-assembler-mips.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/osr.cc b/src/compiler/osr.cc
index 77eea3ce2c..55431c201c 100644
--- a/src/compiler/osr.cc
+++ b/src/compiler/osr.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/ast/scopes.h"
 #include "src/compiler.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/common-operator.h"
@@ -17,7 +18,6 @@
 #include "src/compiler/node.h"
 #include "src/compiler/node-marker.h"
 #include "src/compiler/osr.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/ppc/code-generator-ppc.cc b/src/compiler/ppc/code-generator-ppc.cc
index 6d8fd92435..53cfdcbcd0 100644
--- a/src/compiler/ppc/code-generator-ppc.cc
+++ b/src/compiler/ppc/code-generator-ppc.cc
@@ -4,12 +4,12 @@
 
 #include "src/compiler/code-generator.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/ppc/macro-assembler-ppc.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
index af8f8e8aa7..4ef122eb15 100644
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -4,11 +4,11 @@
 
 #include "src/compiler/code-generator.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/scopes.h"
 #include "src/x64/assembler-x64.h"
 #include "src/x64/macro-assembler-x64.h"
 
diff --git a/src/compiler/x87/code-generator-x87.cc b/src/compiler/x87/code-generator-x87.cc
index c7c025317e..6ac3ec16c5 100644
--- a/src/compiler/x87/code-generator-x87.cc
+++ b/src/compiler/x87/code-generator-x87.cc
@@ -4,11 +4,11 @@
 
 #include "src/compiler/code-generator.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
-#include "src/scopes.h"
 #include "src/x87/assembler-x87.h"
 #include "src/x87/frames-x87.h"
 #include "src/x87/macro-assembler-x87.h"
diff --git a/src/contexts.cc b/src/contexts.cc
index 67d19a1eff..f769b9bb7e 100644
--- a/src/contexts.cc
+++ b/src/contexts.cc
@@ -4,10 +4,10 @@
 
 #include "src/contexts.h"
 
+#include "src/ast/scopeinfo.h"
 #include "src/bootstrapper.h"
 #include "src/debug/debug.h"
 #include "src/isolate-inl.h"
-#include "src/scopeinfo.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/conversions-inl.h b/src/conversions-inl.h
index c05c0644da..35695cd75b 100644
--- a/src/conversions-inl.h
+++ b/src/conversions-inl.h
@@ -20,7 +20,6 @@
 #include "src/conversions.h"
 #include "src/double.h"
 #include "src/objects-inl.h"
-#include "src/scanner.h"
 #include "src/strtod.h"
 
 namespace v8 {
diff --git a/src/crankshaft/arm/lithium-codegen-arm.h b/src/crankshaft/arm/lithium-codegen-arm.h
index 35887c1bef..c301294bb3 100644
--- a/src/crankshaft/arm/lithium-codegen-arm.h
+++ b/src/crankshaft/arm/lithium-codegen-arm.h
@@ -5,12 +5,12 @@
 #ifndef V8_CRANKSHAFT_ARM_LITHIUM_CODEGEN_ARM_H_
 #define V8_CRANKSHAFT_ARM_LITHIUM_CODEGEN_ARM_H_
 
+#include "src/ast/scopes.h"
 #include "src/crankshaft/arm/lithium-arm.h"
 #include "src/crankshaft/arm/lithium-gap-resolver-arm.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/arm64/lithium-codegen-arm64.h b/src/crankshaft/arm64/lithium-codegen-arm64.h
index f5eac7c88b..b0df0f97d4 100644
--- a/src/crankshaft/arm64/lithium-codegen-arm64.h
+++ b/src/crankshaft/arm64/lithium-codegen-arm64.h
@@ -7,11 +7,11 @@
 
 #include "src/crankshaft/arm64/lithium-arm64.h"
 
+#include "src/ast/scopes.h"
 #include "src/crankshaft/arm64/lithium-gap-resolver-arm64.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/hydrogen-osr.h b/src/crankshaft/hydrogen-osr.h
index 52c94dcad3..e2cfd30428 100644
--- a/src/crankshaft/hydrogen-osr.h
+++ b/src/crankshaft/hydrogen-osr.h
@@ -5,7 +5,7 @@
 #ifndef V8_CRANKSHAFT_HYDROGEN_OSR_H_
 #define V8_CRANKSHAFT_HYDROGEN_OSR_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/crankshaft/hydrogen.h"
 #include "src/zone.h"
 
diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
index 7e8c99e93d..6d5a81460b 100644
--- a/src/crankshaft/hydrogen.cc
+++ b/src/crankshaft/hydrogen.cc
@@ -7,7 +7,8 @@
 #include <sstream>
 
 #include "src/allocation-site-scopes.h"
-#include "src/ast-numbering.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/scopeinfo.h"
 #include "src/code-factory.h"
 #include "src/crankshaft/hydrogen-bce.h"
 #include "src/crankshaft/hydrogen-bch.h"
@@ -39,9 +40,8 @@
 // GetRootConstructor
 #include "src/ic/ic-inl.h"
 #include "src/isolate-inl.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/runtime/runtime.h"
-#include "src/scopeinfo.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/crankshaft/ia32/lithium-codegen-ia32.h"  // NOLINT
diff --git a/src/crankshaft/hydrogen.h b/src/crankshaft/hydrogen.h
index 353ef33d9e..c3b5afc4bc 100644
--- a/src/crankshaft/hydrogen.h
+++ b/src/crankshaft/hydrogen.h
@@ -7,11 +7,11 @@
 
 #include "src/accessors.h"
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/bailout-reason.h"
 #include "src/compiler.h"
 #include "src/crankshaft/hydrogen-instructions.h"
-#include "src/scopes.h"
 #include "src/zone.h"
 
 namespace v8 {
diff --git a/src/crankshaft/ia32/lithium-codegen-ia32.h b/src/crankshaft/ia32/lithium-codegen-ia32.h
index 03f6a89b35..506ebf4b3a 100644
--- a/src/crankshaft/ia32/lithium-codegen-ia32.h
+++ b/src/crankshaft/ia32/lithium-codegen-ia32.h
@@ -5,13 +5,13 @@
 #ifndef V8_CRANKSHAFT_IA32_LITHIUM_CODEGEN_IA32_H_
 #define V8_CRANKSHAFT_IA32_LITHIUM_CODEGEN_IA32_H_
 
+#include "src/ast/scopes.h"
 #include "src/base/logging.h"
 #include "src/crankshaft/ia32/lithium-gap-resolver-ia32.h"
 #include "src/crankshaft/ia32/lithium-ia32.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/lithium.cc b/src/crankshaft/lithium.cc
index a2aa84a887..0a940d5b16 100644
--- a/src/crankshaft/lithium.cc
+++ b/src/crankshaft/lithium.cc
@@ -4,7 +4,7 @@
 
 #include "src/crankshaft/lithium.h"
 
-#include "src/scopes.h"
+#include "src/ast/scopes.h"
 
 #if V8_TARGET_ARCH_IA32
 #include "src/crankshaft/ia32/lithium-ia32.h"  // NOLINT
diff --git a/src/crankshaft/mips/lithium-codegen-mips.h b/src/crankshaft/mips/lithium-codegen-mips.h
index 8fc78a96d4..2af8669caf 100644
--- a/src/crankshaft/mips/lithium-codegen-mips.h
+++ b/src/crankshaft/mips/lithium-codegen-mips.h
@@ -5,12 +5,12 @@
 #ifndef V8_CRANKSHAFT_MIPS_LITHIUM_CODEGEN_MIPS_H_
 #define V8_CRANKSHAFT_MIPS_LITHIUM_CODEGEN_MIPS_H_
 
+#include "src/ast/scopes.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/crankshaft/mips/lithium-gap-resolver-mips.h"
 #include "src/crankshaft/mips/lithium-mips.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/mips64/lithium-codegen-mips64.h b/src/crankshaft/mips64/lithium-codegen-mips64.h
index 3d9433be48..6975ca021a 100644
--- a/src/crankshaft/mips64/lithium-codegen-mips64.h
+++ b/src/crankshaft/mips64/lithium-codegen-mips64.h
@@ -5,12 +5,12 @@
 #ifndef V8_CRANKSHAFT_MIPS64_LITHIUM_CODEGEN_MIPS_H_
 #define V8_CRANKSHAFT_MIPS64_LITHIUM_CODEGEN_MIPS_H_
 
+#include "src/ast/scopes.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/crankshaft/mips64/lithium-gap-resolver-mips64.h"
 #include "src/crankshaft/mips64/lithium-mips64.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/ppc/lithium-codegen-ppc.h b/src/crankshaft/ppc/lithium-codegen-ppc.h
index 69653921f7..3eab6303c1 100644
--- a/src/crankshaft/ppc/lithium-codegen-ppc.h
+++ b/src/crankshaft/ppc/lithium-codegen-ppc.h
@@ -5,12 +5,12 @@
 #ifndef V8_CRANKSHAFT_PPC_LITHIUM_CODEGEN_PPC_H_
 #define V8_CRANKSHAFT_PPC_LITHIUM_CODEGEN_PPC_H_
 
+#include "src/ast/scopes.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/crankshaft/ppc/lithium-gap-resolver-ppc.h"
 #include "src/crankshaft/ppc/lithium-ppc.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/typing.cc b/src/crankshaft/typing.cc
index 41a80c5c2c..cf255cbf49 100644
--- a/src/crankshaft/typing.cc
+++ b/src/crankshaft/typing.cc
@@ -4,11 +4,11 @@
 
 #include "src/crankshaft/typing.h"
 
+#include "src/ast/scopes.h"
 #include "src/frames.h"
 #include "src/frames-inl.h"
 #include "src/ostreams.h"
-#include "src/parser.h"  // for CompileTimeValue; TODO(rossberg): should move
-#include "src/scopes.h"
+#include "src/parsing/parser.h"  // for CompileTimeValue; TODO(rossberg): move
 #include "src/splay-tree-inl.h"
 
 namespace v8 {
diff --git a/src/crankshaft/typing.h b/src/crankshaft/typing.h
index d088b84709..40b538aef3 100644
--- a/src/crankshaft/typing.h
+++ b/src/crankshaft/typing.h
@@ -6,9 +6,9 @@
 #define V8_CRANKSHAFT_TYPING_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/effects.h"
-#include "src/scopes.h"
 #include "src/type-info.h"
 #include "src/types.h"
 #include "src/zone.h"
diff --git a/src/crankshaft/x64/lithium-codegen-x64.h b/src/crankshaft/x64/lithium-codegen-x64.h
index eafdc778ad..3e13a4d29f 100644
--- a/src/crankshaft/x64/lithium-codegen-x64.h
+++ b/src/crankshaft/x64/lithium-codegen-x64.h
@@ -6,13 +6,13 @@
 #define V8_CRANKSHAFT_X64_LITHIUM_CODEGEN_X64_H_
 
 
+#include "src/ast/scopes.h"
 #include "src/base/logging.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/crankshaft/x64/lithium-gap-resolver-x64.h"
 #include "src/crankshaft/x64/lithium-x64.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/crankshaft/x87/lithium-codegen-x87.h b/src/crankshaft/x87/lithium-codegen-x87.h
index 821eb822a5..1282d3fedc 100644
--- a/src/crankshaft/x87/lithium-codegen-x87.h
+++ b/src/crankshaft/x87/lithium-codegen-x87.h
@@ -7,13 +7,13 @@
 
 #include <map>
 
+#include "src/ast/scopes.h"
 #include "src/base/logging.h"
 #include "src/crankshaft/lithium-codegen.h"
 #include "src/crankshaft/x87/lithium-gap-resolver-x87.h"
 #include "src/crankshaft/x87/lithium-x87.h"
 #include "src/deoptimizer.h"
 #include "src/safepoint-table.h"
-#include "src/scopes.h"
 #include "src/utils.h"
 
 namespace v8 {
diff --git a/src/dateparser.h b/src/dateparser.h
index 484e1d3eca..533173984c 100644
--- a/src/dateparser.h
+++ b/src/dateparser.h
@@ -7,7 +7,7 @@
 
 #include "src/allocation.h"
 #include "src/char-predicates.h"
-#include "src/scanner.h"
+#include "src/parsing/scanner.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/debug/debug-scopes.cc b/src/debug/debug-scopes.cc
index 99d96404d1..52b3bf733f 100644
--- a/src/debug/debug-scopes.cc
+++ b/src/debug/debug-scopes.cc
@@ -4,12 +4,12 @@
 
 #include "src/debug/debug-scopes.h"
 
+#include "src/ast/scopes.h"
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/globals.h"
 #include "src/isolate-inl.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/debug/liveedit.cc b/src/debug/liveedit.cc
index dfd52bf617..de377250dd 100644
--- a/src/debug/liveedit.cc
+++ b/src/debug/liveedit.cc
@@ -4,6 +4,8 @@
 
 #include "src/debug/liveedit.h"
 
+#include "src/ast/scopeinfo.h"
+#include "src/ast/scopes.h"
 #include "src/code-stubs.h"
 #include "src/compilation-cache.h"
 #include "src/compiler.h"
@@ -13,9 +15,7 @@
 #include "src/global-handles.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
-#include "src/parser.h"
-#include "src/scopeinfo.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 #include "src/v8.h"
 #include "src/v8memory.h"
 
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index dc50cb93cd..4974a1ca9f 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -5,13 +5,13 @@
 #include "src/deoptimizer.h"
 
 #include "src/accessors.h"
+#include "src/ast/prettyprinter.h"
 #include "src/codegen.h"
 #include "src/disasm.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
 #include "src/macro-assembler.h"
-#include "src/prettyprinter.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/v8.h"
 
diff --git a/src/frames.cc b/src/frames.cc
index 18c8a1b452..2d188cc97c 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -6,14 +6,14 @@
 
 #include <sstream>
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopeinfo.h"
 #include "src/base/bits.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/register-configuration.h"
 #include "src/safepoint-table.h"
-#include "src/scopeinfo.h"
 #include "src/string-stream.h"
 #include "src/vm-state-inl.h"
 
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc
index 7e02f62050..94a695edae 100644
--- a/src/full-codegen/arm/full-codegen-arm.cc
+++ b/src/full-codegen/arm/full-codegen-arm.cc
@@ -4,14 +4,14 @@
 
 #if V8_TARGET_ARCH_ARM
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 #include "src/arm/code-stubs-arm.h"
 #include "src/arm/macro-assembler-arm.h"
diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc
index 656ab0e30e..38c57838ad 100644
--- a/src/full-codegen/arm64/full-codegen-arm64.cc
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc
@@ -4,14 +4,14 @@
 
 #if V8_TARGET_ARCH_ARM64
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 #include "src/arm64/code-stubs-arm64.h"
 #include "src/arm64/frames-arm64.h"
diff --git a/src/full-codegen/full-codegen.cc b/src/full-codegen/full-codegen.cc
index 03f1b51378..c8c43bf8ce 100644
--- a/src/full-codegen/full-codegen.cc
+++ b/src/full-codegen/full-codegen.cc
@@ -4,8 +4,11 @@
 
 #include "src/full-codegen/full-codegen.h"
 
-#include "src/ast.h"
-#include "src/ast-numbering.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/prettyprinter.h"
+#include "src/ast/scopeinfo.h"
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/compiler.h"
@@ -13,9 +16,6 @@
 #include "src/debug/liveedit.h"
 #include "src/isolate-inl.h"
 #include "src/macro-assembler.h"
-#include "src/prettyprinter.h"
-#include "src/scopeinfo.h"
-#include "src/scopes.h"
 #include "src/snapshot/snapshot.h"
 
 namespace v8 {
diff --git a/src/full-codegen/full-codegen.h b/src/full-codegen/full-codegen.h
index a718552e15..22f3710a11 100644
--- a/src/full-codegen/full-codegen.h
+++ b/src/full-codegen/full-codegen.h
@@ -7,7 +7,8 @@
 
 #include "src/allocation.h"
 #include "src/assert-scope.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/bit-vector.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
@@ -15,7 +16,6 @@
 #include "src/compiler.h"
 #include "src/globals.h"
 #include "src/objects.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc
index cd7b935736..3a3e649cda 100644
--- a/src/full-codegen/ia32/full-codegen-ia32.cc
+++ b/src/full-codegen/ia32/full-codegen-ia32.cc
@@ -4,6 +4,7 @@
 
 #if V8_TARGET_ARCH_IA32
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
@@ -11,8 +12,7 @@
 #include "src/full-codegen/full-codegen.h"
 #include "src/ia32/frames-ia32.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc
index a550484fb5..cc1ccae88b 100644
--- a/src/full-codegen/mips/full-codegen-mips.cc
+++ b/src/full-codegen/mips/full-codegen-mips.cc
@@ -12,14 +12,14 @@
 // places where we have to move a previous result in v0 to a0 for the
 // next call: mov(a0, v0). This is not needed on the other architectures.
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 #include "src/mips/code-stubs-mips.h"
 #include "src/mips/macro-assembler-mips.h"
diff --git a/src/full-codegen/mips64/full-codegen-mips64.cc b/src/full-codegen/mips64/full-codegen-mips64.cc
index fd79c97880..8d8fe48555 100644
--- a/src/full-codegen/mips64/full-codegen-mips64.cc
+++ b/src/full-codegen/mips64/full-codegen-mips64.cc
@@ -12,14 +12,14 @@
 // places where we have to move a previous result in v0 to a0 for the
 // next call: mov(a0, v0). This is not needed on the other architectures.
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 #include "src/mips64/code-stubs-mips64.h"
 #include "src/mips64/macro-assembler-mips64.h"
diff --git a/src/full-codegen/ppc/full-codegen-ppc.cc b/src/full-codegen/ppc/full-codegen-ppc.cc
index 42c348a0f6..c3998ce3bb 100644
--- a/src/full-codegen/ppc/full-codegen-ppc.cc
+++ b/src/full-codegen/ppc/full-codegen-ppc.cc
@@ -4,14 +4,14 @@
 
 #if V8_TARGET_ARCH_PPC
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 #include "src/ppc/code-stubs-ppc.h"
 #include "src/ppc/macro-assembler-ppc.h"
diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
index b5f3ebbab6..7b52316660 100644
--- a/src/full-codegen/x64/full-codegen-x64.cc
+++ b/src/full-codegen/x64/full-codegen-x64.cc
@@ -4,14 +4,14 @@
 
 #if V8_TARGET_ARCH_X64
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc
index 854a6a5809..0a142223f7 100644
--- a/src/full-codegen/x87/full-codegen-x87.cc
+++ b/src/full-codegen/x87/full-codegen-x87.cc
@@ -4,14 +4,14 @@
 
 #if V8_TARGET_ARCH_X87
 
+#include "src/ast/scopes.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/ic/ic.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/parser/parser.h"
 #include "src/x87/frames-x87.h"
 
 namespace v8 {
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 4745f27fb3..5137301ddf 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -6,6 +6,7 @@
 
 #include "src/accessors.h"
 #include "src/api.h"
+#include "src/ast/scopeinfo.h"
 #include "src/base/bits.h"
 #include "src/base/once.h"
 #include "src/base/utils/random-number-generator.h"
@@ -32,7 +33,6 @@
 #include "src/interpreter/interpreter.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/runtime-profiler.h"
-#include "src/scopeinfo.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/serialize.h"
 #include "src/snapshot/snapshot.h"
diff --git a/src/ia32/codegen-ia32.h b/src/ia32/codegen-ia32.h
index 03bb128dd6..133b1adbdf 100644
--- a/src/ia32/codegen-ia32.h
+++ b/src/ia32/codegen-ia32.h
@@ -5,7 +5,7 @@
 #ifndef V8_IA32_CODEGEN_IA32_H_
 #define V8_IA32_CODEGEN_IA32_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/interpreter/bytecode-array-builder.h b/src/interpreter/bytecode-array-builder.h
index 5875befe5f..d9b3a566fc 100644
--- a/src/interpreter/bytecode-array-builder.h
+++ b/src/interpreter/bytecode-array-builder.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/identity-map.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/zone.h"
diff --git a/src/interpreter/bytecode-generator.cc b/src/interpreter/bytecode-generator.cc
index a3022b6fc4..1d6532c8eb 100644
--- a/src/interpreter/bytecode-generator.cc
+++ b/src/interpreter/bytecode-generator.cc
@@ -4,12 +4,12 @@
 
 #include "src/interpreter/bytecode-generator.h"
 
+#include "src/ast/scopes.h"
 #include "src/compiler.h"
 #include "src/interpreter/control-flow-builders.h"
 #include "src/objects.h"
-#include "src/parser.h"
-#include "src/scopes.h"
-#include "src/token.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/token.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/interpreter/bytecode-generator.h b/src/interpreter/bytecode-generator.h
index be1bfe2760..35987c46b0 100644
--- a/src/interpreter/bytecode-generator.h
+++ b/src/interpreter/bytecode-generator.h
@@ -5,7 +5,7 @@
 #ifndef V8_INTERPRETER_BYTECODE_GENERATOR_H_
 #define V8_INTERPRETER_BYTECODE_GENERATOR_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/bytecodes.h"
 
diff --git a/src/interpreter/interpreter.h b/src/interpreter/interpreter.h
index 680322a003..e993f2b446 100644
--- a/src/interpreter/interpreter.h
+++ b/src/interpreter/interpreter.h
@@ -11,8 +11,8 @@
 #include "src/base/macros.h"
 #include "src/builtins.h"
 #include "src/interpreter/bytecodes.h"
+#include "src/parsing/token.h"
 #include "src/runtime/runtime.h"
-#include "src/token.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/isolate.cc b/src/isolate.cc
index 883c02842b..457c4c5e07 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -9,7 +9,8 @@
 #include <fstream>  // NOLINT(readability/streams)
 #include <sstream>
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopeinfo.h"
 #include "src/base/platform/platform.h"
 #include "src/base/sys-info.h"
 #include "src/base/utils/random-number-generator.h"
@@ -32,7 +33,6 @@
 #include "src/prototype.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/runtime-profiler.h"
-#include "src/scopeinfo.h"
 #include "src/simulator.h"
 #include "src/snapshot/serialize.h"
 #include "src/v8.h"
diff --git a/src/mips/codegen-mips.h b/src/mips/codegen-mips.h
index 22784fcf53..ad7abb30c5 100644
--- a/src/mips/codegen-mips.h
+++ b/src/mips/codegen-mips.h
@@ -7,7 +7,7 @@
 #define V8_MIPS_CODEGEN_MIPS_H_
 
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/mips64/codegen-mips64.h b/src/mips64/codegen-mips64.h
index 22784fcf53..ad7abb30c5 100644
--- a/src/mips64/codegen-mips64.h
+++ b/src/mips64/codegen-mips64.h
@@ -7,7 +7,7 @@
 #define V8_MIPS_CODEGEN_MIPS_H_
 
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/expression-classifier.h b/src/parsing/expression-classifier.h
similarity index 98%
rename from src/expression-classifier.h
rename to src/parsing/expression-classifier.h
index 7392a7add8..c9f291a742 100644
--- a/src/expression-classifier.h
+++ b/src/parsing/expression-classifier.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_EXPRESSION_CLASSIFIER_H
-#define V8_EXPRESSION_CLASSIFIER_H
+#ifndef V8_PARSING_EXPRESSION_CLASSIFIER_H
+#define V8_PARSING_EXPRESSION_CLASSIFIER_H
 
 #include "src/messages.h"
-#include "src/scanner.h"
-#include "src/token.h"
+#include "src/parsing/scanner.h"
+#include "src/parsing/token.h"
 
 namespace v8 {
 namespace internal {
@@ -301,4 +301,4 @@ class ExpressionClassifier {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_EXPRESSION_CLASSIFIER_H
+#endif  // V8_PARSING_EXPRESSION_CLASSIFIER_H
diff --git a/src/func-name-inferrer.cc b/src/parsing/func-name-inferrer.cc
similarity index 96%
rename from src/func-name-inferrer.cc
rename to src/parsing/func-name-inferrer.cc
index 5006c03eb6..12013afd28 100644
--- a/src/func-name-inferrer.cc
+++ b/src/parsing/func-name-inferrer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/func-name-inferrer.h"
+#include "src/parsing/func-name-inferrer.h"
 
-#include "src/ast.h"
-#include "src/ast-value-factory.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-value-factory.h"
 #include "src/list-inl.h"
 
 namespace v8 {
diff --git a/src/func-name-inferrer.h b/src/parsing/func-name-inferrer.h
similarity index 96%
rename from src/func-name-inferrer.h
rename to src/parsing/func-name-inferrer.h
index 8bc0e6c81e..d0e4cad429 100644
--- a/src/func-name-inferrer.h
+++ b/src/parsing/func-name-inferrer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_FUNC_NAME_INFERRER_H_
-#define V8_FUNC_NAME_INFERRER_H_
+#ifndef V8_PARSING_FUNC_NAME_INFERRER_H_
+#define V8_PARSING_FUNC_NAME_INFERRER_H_
 
 #include "src/handles.h"
 #include "src/zone.h"
@@ -112,4 +112,4 @@ class FuncNameInferrer : public ZoneObject {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_FUNC_NAME_INFERRER_H_
+#endif  // V8_PARSING_FUNC_NAME_INFERRER_H_
diff --git a/src/json-parser.h b/src/parsing/json-parser.h
similarity index 99%
rename from src/json-parser.h
rename to src/parsing/json-parser.h
index 21889530c3..7273c36dfd 100644
--- a/src/json-parser.h
+++ b/src/parsing/json-parser.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_JSON_PARSER_H_
-#define V8_JSON_PARSER_H_
+#ifndef V8_PARSING_JSON_PARSER_H_
+#define V8_PARSING_JSON_PARSER_H_
 
 #include "src/char-predicates.h"
 #include "src/conversions.h"
 #include "src/debug/debug.h"
 #include "src/factory.h"
 #include "src/messages.h"
-#include "src/scanner.h"
-#include "src/token.h"
+#include "src/parsing/scanner.h"
+#include "src/parsing/token.h"
 #include "src/transitions.h"
 #include "src/types.h"
 
@@ -848,4 +848,4 @@ Handle<String> JsonParser<seq_one_byte>::ScanJsonString() {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_JSON_PARSER_H_
+#endif  // V8_PARSING_JSON_PARSER_H_
diff --git a/src/parameter-initializer-rewriter.cc b/src/parsing/parameter-initializer-rewriter.cc
similarity index 93%
rename from src/parameter-initializer-rewriter.cc
rename to src/parsing/parameter-initializer-rewriter.cc
index 28f741c1f6..eaf1889392 100644
--- a/src/parameter-initializer-rewriter.cc
+++ b/src/parsing/parameter-initializer-rewriter.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/parameter-initializer-rewriter.h"
+#include "src/parsing/parameter-initializer-rewriter.h"
 
-#include "src/ast.h"
-#include "src/ast-expression-visitor.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-expression-visitor.h"
+#include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/parameter-initializer-rewriter.h b/src/parsing/parameter-initializer-rewriter.h
similarity index 71%
rename from src/parameter-initializer-rewriter.h
rename to src/parsing/parameter-initializer-rewriter.h
index a195cb600f..255534c99e 100644
--- a/src/parameter-initializer-rewriter.h
+++ b/src/parsing/parameter-initializer-rewriter.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PARAMETER_EXPRESSION_REWRITER_H_
-#define V8_PARAMETER_EXPRESSION_REWRITER_H_
+#ifndef V8_PARSING_PARAMETER_EXPRESSION_REWRITER_H_
+#define V8_PARSING_PARAMETER_EXPRESSION_REWRITER_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 
 namespace v8 {
 namespace internal {
@@ -19,4 +19,4 @@ void RewriteParameterInitializerScope(uintptr_t stack_limit,
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_PARAMETER_EXPRESSION_REWRITER_H_
+#endif  // V8_PARSING_PARAMETER_EXPRESSION_REWRITER_H_
diff --git a/src/parser.cc b/src/parsing/parser.cc
similarity index 99%
rename from src/parser.cc
rename to src/parsing/parser.cc
index 5ecda894c1..c4f481083c 100644
--- a/src/parser.cc
+++ b/src/parsing/parser.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 
 #include "src/api.h"
-#include "src/ast.h"
-#include "src/ast-literal-reindexer.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-literal-reindexer.h"
+#include "src/ast/scopeinfo.h"
 #include "src/bailout-reason.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
@@ -14,12 +15,11 @@
 #include "src/codegen.h"
 #include "src/compiler.h"
 #include "src/messages.h"
-#include "src/parameter-initializer-rewriter.h"
-#include "src/preparser.h"
-#include "src/rewriter.h"
+#include "src/parsing/parameter-initializer-rewriter.h"
+#include "src/parsing/preparser.h"
+#include "src/parsing/rewriter.h"
+#include "src/parsing/scanner-character-streams.h"
 #include "src/runtime/runtime.h"
-#include "src/scanner-character-streams.h"
-#include "src/scopeinfo.h"
 #include "src/string-stream.h"
 
 namespace v8 {
diff --git a/src/parser.h b/src/parsing/parser.h
similarity index 99%
rename from src/parser.h
rename to src/parsing/parser.h
index c912c8f020..b27f551271 100644
--- a/src/parser.h
+++ b/src/parsing/parser.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PARSER_H_
-#define V8_PARSER_H_
+#ifndef V8_PARSING_PARSER_H_
+#define V8_PARSING_PARSER_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/compiler.h"  // TODO(titzer): remove this include dependency
+#include "src/parsing/preparse-data.h"
+#include "src/parsing/preparse-data-format.h"
+#include "src/parsing/preparser.h"
 #include "src/pending-compilation-error-handler.h"
-#include "src/preparse-data.h"
-#include "src/preparse-data-format.h"
-#include "src/preparser.h"
-#include "src/scopes.h"
 
 namespace v8 {
 
@@ -1409,4 +1409,4 @@ DoExpression* ParserTraits::ParseDoExpression(bool* ok) {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_PARSER_H_
+#endif  // V8_PARSING_PARSER_H_
diff --git a/src/pattern-rewriter.cc b/src/parsing/pattern-rewriter.cc
similarity index 99%
rename from src/pattern-rewriter.cc
rename to src/parsing/pattern-rewriter.cc
index e523115568..037e96b86d 100644
--- a/src/pattern-rewriter.cc
+++ b/src/parsing/pattern-rewriter.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/messages.h"
-#include "src/parameter-initializer-rewriter.h"
-#include "src/parser.h"
+#include "src/parsing/parameter-initializer-rewriter.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 
diff --git a/src/preparse-data-format.h b/src/parsing/preparse-data-format.h
similarity index 89%
rename from src/preparse-data-format.h
rename to src/parsing/preparse-data-format.h
index c68a684562..f7d9f68cce 100644
--- a/src/preparse-data-format.h
+++ b/src/parsing/preparse-data-format.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PREPARSE_DATA_FORMAT_H_
-#define V8_PREPARSE_DATA_FORMAT_H_
+#ifndef V8_PARSING_PREPARSE_DATA_FORMAT_H_
+#define V8_PARSING_PREPARSE_DATA_FORMAT_H_
 
 namespace v8 {
 namespace internal {
@@ -38,4 +38,4 @@ struct PreparseDataConstants {
 }  // namespace internal
 }  // namespace v8.
 
-#endif  // V8_PREPARSE_DATA_FORMAT_H_
+#endif  // V8_PARSING_PREPARSE_DATA_FORMAT_H_
diff --git a/src/preparse-data.cc b/src/parsing/preparse-data.cc
similarity index 96%
rename from src/preparse-data.cc
rename to src/parsing/preparse-data.cc
index ffbfbab633..d02cd63d66 100644
--- a/src/preparse-data.cc
+++ b/src/parsing/preparse-data.cc
@@ -5,9 +5,9 @@
 #include "src/base/logging.h"
 #include "src/globals.h"
 #include "src/hashmap.h"
-#include "src/parser.h"
-#include "src/preparse-data.h"
-#include "src/preparse-data-format.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/preparse-data.h"
+#include "src/parsing/preparse-data-format.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/preparse-data.h b/src/parsing/preparse-data.h
similarity index 97%
rename from src/preparse-data.h
rename to src/parsing/preparse-data.h
index 711ff3b895..dbe1022d1e 100644
--- a/src/preparse-data.h
+++ b/src/parsing/preparse-data.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PREPARSE_DATA_H_
-#define V8_PREPARSE_DATA_H_
+#ifndef V8_PARSING_PREPARSE_DATA_H_
+#define V8_PARSING_PREPARSE_DATA_H_
 
 #include "src/allocation.h"
 #include "src/hashmap.h"
 #include "src/messages.h"
-#include "src/preparse-data-format.h"
+#include "src/parsing/preparse-data-format.h"
 
 namespace v8 {
 namespace internal {
@@ -209,4 +209,4 @@ class CompleteParserRecorder : public ParserRecorder {
 }  // namespace internal
 }  // namespace v8.
 
-#endif  // V8_PREPARSE_DATA_H_
+#endif  // V8_PARSING_PREPARSE_DATA_H_
diff --git a/src/preparser.cc b/src/parsing/preparser.cc
similarity index 99%
rename from src/preparser.cc
rename to src/parsing/preparser.cc
index 30d6faae14..25b5195284 100644
--- a/src/preparser.cc
+++ b/src/parsing/preparser.cc
@@ -11,9 +11,9 @@
 #include "src/globals.h"
 #include "src/hashmap.h"
 #include "src/list.h"
-#include "src/preparse-data.h"
-#include "src/preparse-data-format.h"
-#include "src/preparser.h"
+#include "src/parsing/preparse-data.h"
+#include "src/parsing/preparse-data-format.h"
+#include "src/parsing/preparser.h"
 #include "src/unicode.h"
 #include "src/utils.h"
 
diff --git a/src/preparser.h b/src/parsing/preparser.h
similarity index 99%
rename from src/preparser.h
rename to src/parsing/preparser.h
index ff9282c2ee..e93f3f998d 100644
--- a/src/preparser.h
+++ b/src/parsing/preparser.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_PREPARSER_H
-#define V8_PREPARSER_H
+#ifndef V8_PARSING_PREPARSER_H
+#define V8_PARSING_PREPARSER_H
 
+#include "src/ast/scopes.h"
 #include "src/bailout-reason.h"
-#include "src/expression-classifier.h"
-#include "src/func-name-inferrer.h"
 #include "src/hashmap.h"
 #include "src/messages.h"
-#include "src/scanner.h"
-#include "src/scopes.h"
-#include "src/token.h"
+#include "src/parsing/expression-classifier.h"
+#include "src/parsing/func-name-inferrer.h"
+#include "src/parsing/scanner.h"
+#include "src/parsing/token.h"
 
 namespace v8 {
 namespace internal {
@@ -4259,4 +4259,4 @@ void ParserBase<Traits>::ClassLiteralChecker::CheckProperty(
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_PREPARSER_H
+#endif  // V8_PARSING_PREPARSER_H
diff --git a/src/rewriter.cc b/src/parsing/rewriter.cc
similarity index 99%
rename from src/rewriter.cc
rename to src/parsing/rewriter.cc
index 1f19739331..4da60aca18 100644
--- a/src/rewriter.cc
+++ b/src/parsing/rewriter.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/rewriter.h"
+#include "src/parsing/rewriter.h"
 
-#include "src/ast.h"
-#include "src/parser.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/rewriter.h b/src/parsing/rewriter.h
similarity index 91%
rename from src/rewriter.h
rename to src/parsing/rewriter.h
index fdb36d1d3e..477644a756 100644
--- a/src/rewriter.h
+++ b/src/parsing/rewriter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_REWRITER_H_
-#define V8_REWRITER_H_
+#ifndef V8_PARSING_REWRITER_H_
+#define V8_PARSING_REWRITER_H_
 
 namespace v8 {
 namespace internal {
@@ -33,4 +33,4 @@ class Rewriter {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_REWRITER_H_
+#endif  // V8_PARSING_REWRITER_H_
diff --git a/src/scanner-character-streams.cc b/src/parsing/scanner-character-streams.cc
similarity index 99%
rename from src/scanner-character-streams.cc
rename to src/parsing/scanner-character-streams.cc
index a58f392c0c..68d531443d 100644
--- a/src/scanner-character-streams.cc
+++ b/src/parsing/scanner-character-streams.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/scanner-character-streams.h"
+#include "src/parsing/scanner-character-streams.h"
 
 #include "include/v8.h"
 #include "src/globals.h"
diff --git a/src/scanner-character-streams.h b/src/parsing/scanner-character-streams.h
similarity index 96%
rename from src/scanner-character-streams.h
rename to src/parsing/scanner-character-streams.h
index 8a0ae23926..603db93d02 100644
--- a/src/scanner-character-streams.h
+++ b/src/parsing/scanner-character-streams.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_SCANNER_CHARACTER_STREAMS_H_
-#define V8_SCANNER_CHARACTER_STREAMS_H_
+#ifndef V8_PARSING_SCANNER_CHARACTER_STREAMS_H_
+#define V8_PARSING_SCANNER_CHARACTER_STREAMS_H_
 
 #include "src/handles.h"
-#include "src/scanner.h"
+#include "src/parsing/scanner.h"
 #include "src/vector.h"
 
 namespace v8 {
@@ -186,4 +186,4 @@ class ExternalTwoByteStringUtf16CharacterStream: public Utf16CharacterStream {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_SCANNER_CHARACTER_STREAMS_H_
+#endif  // V8_PARSING_SCANNER_CHARACTER_STREAMS_H_
diff --git a/src/scanner.cc b/src/parsing/scanner.cc
similarity index 99%
rename from src/scanner.cc
rename to src/parsing/scanner.cc
index 3031144b09..524740885b 100644
--- a/src/scanner.cc
+++ b/src/parsing/scanner.cc
@@ -4,17 +4,17 @@
 
 // Features shared by parsing and pre-parsing scanners.
 
-#include "src/scanner.h"
+#include "src/parsing/scanner.h"
 
 #include <stdint.h>
 
 #include <cmath>
 
-#include "src/ast-value-factory.h"
+#include "src/ast/ast-value-factory.h"
 #include "src/char-predicates-inl.h"
 #include "src/conversions-inl.h"
 #include "src/list-inl.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/scanner.h b/src/parsing/scanner.h
similarity index 99%
rename from src/scanner.h
rename to src/parsing/scanner.h
index 8a39bd918b..abaccf5725 100644
--- a/src/scanner.h
+++ b/src/parsing/scanner.h
@@ -4,8 +4,8 @@
 
 // Features shared by parsing and pre-parsing scanners.
 
-#ifndef V8_SCANNER_H_
-#define V8_SCANNER_H_
+#ifndef V8_PARSING_SCANNER_H_
+#define V8_PARSING_SCANNER_H_
 
 #include "src/allocation.h"
 #include "src/base/logging.h"
@@ -13,7 +13,7 @@
 #include "src/globals.h"
 #include "src/hashmap.h"
 #include "src/list.h"
-#include "src/token.h"
+#include "src/parsing/token.h"
 #include "src/unicode.h"
 #include "src/unicode-decoder.h"
 #include "src/utils.h"
@@ -768,4 +768,4 @@ class Scanner {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_SCANNER_H_
+#endif  // V8_PARSING_SCANNER_H_
diff --git a/src/token.cc b/src/parsing/token.cc
similarity index 96%
rename from src/token.cc
rename to src/parsing/token.cc
index 73e883f4bd..7edfefa821 100644
--- a/src/token.cc
+++ b/src/parsing/token.cc
@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 #include <stdint.h>
-#include "src/token.h"
+
+#include "src/parsing/token.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/token.h b/src/parsing/token.h
similarity index 99%
rename from src/token.h
rename to src/parsing/token.h
index 24502dce3e..fee1f7e85a 100644
--- a/src/token.h
+++ b/src/parsing/token.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_TOKEN_H_
-#define V8_TOKEN_H_
+#ifndef V8_PARSING_TOKEN_H_
+#define V8_PARSING_TOKEN_H_
 
 #include "src/base/logging.h"
 #include "src/globals.h"
@@ -321,4 +321,4 @@ class Token {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_TOKEN_H_
+#endif  // V8_PARSING_TOKEN_H_
diff --git a/src/ppc/codegen-ppc.h b/src/ppc/codegen-ppc.h
index 7f19beea7d..c3cd9b39a0 100644
--- a/src/ppc/codegen-ppc.h
+++ b/src/ppc/codegen-ppc.h
@@ -5,7 +5,7 @@
 #ifndef V8_PPC_CODEGEN_PPC_H_
 #define V8_PPC_CODEGEN_PPC_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/profiler/profile-generator.cc b/src/profiler/profile-generator.cc
index 21fa5ca4a4..d964add5f2 100644
--- a/src/profiler/profile-generator.cc
+++ b/src/profiler/profile-generator.cc
@@ -4,12 +4,12 @@
 
 #include "src/profiler/profile-generator.h"
 
+#include "src/ast/scopeinfo.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
 #include "src/profiler/profile-generator-inl.h"
 #include "src/profiler/sampler.h"
-#include "src/scopeinfo.h"
 #include "src/splay-tree-inl.h"
 #include "src/unicode.h"
 
diff --git a/src/regexp/interpreter-irregexp.cc b/src/regexp/interpreter-irregexp.cc
index fb6045e5d7..ea748e4e55 100644
--- a/src/regexp/interpreter-irregexp.cc
+++ b/src/regexp/interpreter-irregexp.cc
@@ -6,7 +6,7 @@
 
 #include "src/regexp/interpreter-irregexp.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/regexp/bytecodes-irregexp.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
diff --git a/src/regexp/jsregexp.cc b/src/regexp/jsregexp.cc
index 5988eccf36..8a566bfa77 100644
--- a/src/regexp/jsregexp.cc
+++ b/src/regexp/jsregexp.cc
@@ -4,7 +4,7 @@
 
 #include "src/regexp/jsregexp.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/base/platform/platform.h"
 #include "src/compilation-cache.h"
 #include "src/compiler.h"
@@ -13,7 +13,7 @@
 #include "src/isolate-inl.h"
 #include "src/messages.h"
 #include "src/ostreams.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/regexp/interpreter-irregexp.h"
 #include "src/regexp/jsregexp-inl.h"
 #include "src/regexp/regexp-macro-assembler.h"
diff --git a/src/regexp/regexp-macro-assembler-irregexp-inl.h b/src/regexp/regexp-macro-assembler-irregexp-inl.h
index 6f176cd12c..4d0b1bc0a7 100644
--- a/src/regexp/regexp-macro-assembler-irregexp-inl.h
+++ b/src/regexp/regexp-macro-assembler-irregexp-inl.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_IRREGEXP_INL_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_IRREGEXP_INL_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/regexp/bytecodes-irregexp.h"
 
 namespace v8 {
diff --git a/src/regexp/regexp-macro-assembler-irregexp.cc b/src/regexp/regexp-macro-assembler-irregexp.cc
index 90a92e48b4..751ee441c8 100644
--- a/src/regexp/regexp-macro-assembler-irregexp.cc
+++ b/src/regexp/regexp-macro-assembler-irregexp.cc
@@ -4,7 +4,7 @@
 
 #include "src/regexp/regexp-macro-assembler-irregexp.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/regexp/bytecodes-irregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-macro-assembler-irregexp-inl.h"
diff --git a/src/regexp/regexp-macro-assembler-tracer.cc b/src/regexp/regexp-macro-assembler-tracer.cc
index f52069168e..661df7470b 100644
--- a/src/regexp/regexp-macro-assembler-tracer.cc
+++ b/src/regexp/regexp-macro-assembler-tracer.cc
@@ -4,7 +4,7 @@
 
 #include "src/regexp/regexp-macro-assembler-tracer.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/regexp/regexp-macro-assembler.cc b/src/regexp/regexp-macro-assembler.cc
index 7e4177c775..caf8b51fe5 100644
--- a/src/regexp/regexp-macro-assembler.cc
+++ b/src/regexp/regexp-macro-assembler.cc
@@ -5,7 +5,6 @@
 #include "src/regexp/regexp-macro-assembler.h"
 
 #include "src/assembler.h"
-#include "src/ast.h"
 #include "src/isolate-inl.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/simulator.h"
diff --git a/src/regexp/regexp-macro-assembler.h b/src/regexp/regexp-macro-assembler.h
index d52f969848..73cc52a835 100644
--- a/src/regexp/regexp-macro-assembler.h
+++ b/src/regexp/regexp-macro-assembler.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index d2edd1b2b7..c2254207fe 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -5,6 +5,7 @@
 #include "src/runtime-profiler.h"
 
 #include "src/assembler.h"
+#include "src/ast/scopeinfo.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ -13,7 +14,6 @@
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
-#include "src/scopeinfo.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/runtime/runtime-internal.cc b/src/runtime/runtime-internal.cc
index 131ab6247e..a2933e5bed 100644
--- a/src/runtime/runtime-internal.cc
+++ b/src/runtime/runtime-internal.cc
@@ -5,14 +5,14 @@
 #include "src/runtime/runtime-utils.h"
 
 #include "src/arguments.h"
+#include "src/ast/prettyprinter.h"
 #include "src/bootstrapper.h"
 #include "src/conversions.h"
 #include "src/debug/debug.h"
 #include "src/frames-inl.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
-#include "src/parser.h"
-#include "src/prettyprinter.h"
+#include "src/parsing/parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/runtime/runtime-json.cc b/src/runtime/runtime-json.cc
index 07232d59b8..45f8183052 100644
--- a/src/runtime/runtime-json.cc
+++ b/src/runtime/runtime-json.cc
@@ -7,9 +7,9 @@
 #include "src/arguments.h"
 #include "src/char-predicates-inl.h"
 #include "src/isolate-inl.h"
-#include "src/json-parser.h"
 #include "src/json-stringifier.h"
 #include "src/objects-inl.h"
+#include "src/parsing/json-parser.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/runtime/runtime-literals.cc b/src/runtime/runtime-literals.cc
index 01d1fe8aaa..7c17aa005f 100644
--- a/src/runtime/runtime-literals.cc
+++ b/src/runtime/runtime-literals.cc
@@ -6,9 +6,9 @@
 
 #include "src/allocation-site-scopes.h"
 #include "src/arguments.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/isolate-inl.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/runtime/runtime.h"
 
 namespace v8 {
diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc
index 14439fa387..b91e58b28d 100644
--- a/src/runtime/runtime-scopes.cc
+++ b/src/runtime/runtime-scopes.cc
@@ -6,11 +6,11 @@
 
 #include "src/accessors.h"
 #include "src/arguments.h"
+#include "src/ast/scopeinfo.h"
+#include "src/ast/scopes.h"
 #include "src/frames-inl.h"
 #include "src/isolate-inl.h"
 #include "src/messages.h"
-#include "src/scopeinfo.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index f4563984f9..8da750a222 100644
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -15,7 +15,7 @@
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
 #include "src/objects.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/natives.h"
diff --git a/src/type-info.cc b/src/type-info.cc
index 6971c1fd5e..45fde7700b 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -4,7 +4,7 @@
 
 #include "src/type-info.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/code-stubs.h"
 #include "src/compiler.h"
 #include "src/ic/ic.h"
diff --git a/src/type-info.h b/src/type-info.h
index f92f74cc1e..13a7f88b66 100644
--- a/src/type-info.h
+++ b/src/type-info.h
@@ -8,7 +8,7 @@
 #include "src/allocation.h"
 #include "src/contexts.h"
 #include "src/globals.h"
-#include "src/token.h"
+#include "src/parsing/token.h"
 #include "src/types.h"
 #include "src/zone.h"
 
diff --git a/src/typing-asm.cc b/src/typing-asm.cc
index da752418a6..e121e7f19a 100644
--- a/src/typing-asm.cc
+++ b/src/typing-asm.cc
@@ -6,9 +6,9 @@
 
 #include "src/typing-asm.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/codegen.h"
-#include "src/scopes.h"
 #include "src/type-cache.h"
 
 namespace v8 {
diff --git a/src/typing-asm.h b/src/typing-asm.h
index 5f7a929a1e..bd0a09b063 100644
--- a/src/typing-asm.h
+++ b/src/typing-asm.h
@@ -6,7 +6,7 @@
 #define V8_TYPING_ASM_H_
 
 #include "src/allocation.h"
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/effects.h"
 #include "src/type-info.h"
 #include "src/types.h"
diff --git a/src/typing-reset.cc b/src/typing-reset.cc
index b67b23507c..c22f7a9276 100644
--- a/src/typing-reset.cc
+++ b/src/typing-reset.cc
@@ -6,9 +6,9 @@
 
 #include "src/typing-reset.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/codegen.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/typing-reset.h b/src/typing-reset.h
index 84e51773e7..3e1969d9ed 100644
--- a/src/typing-reset.h
+++ b/src/typing-reset.h
@@ -5,7 +5,7 @@
 #ifndef V8_TYPING_RESET_H_
 #define V8_TYPING_RESET_H_
 
-#include "src/ast-expression-visitor.h"
+#include "src/ast/ast-expression-visitor.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/x64/codegen-x64.h b/src/x64/codegen-x64.h
index 09af38ddea..1403781c67 100644
--- a/src/x64/codegen-x64.h
+++ b/src/x64/codegen-x64.h
@@ -5,7 +5,7 @@
 #ifndef V8_X64_CODEGEN_X64_H_
 #define V8_X64_CODEGEN_X64_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/src/x87/codegen-x87.h b/src/x87/codegen-x87.h
index e786b84f04..170b40397a 100644
--- a/src/x87/codegen-x87.h
+++ b/src/x87/codegen-x87.h
@@ -5,7 +5,7 @@
 #ifndef V8_X87_CODEGEN_X87_H_
 #define V8_X87_CODEGEN_X87_H_
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/macro-assembler.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/function-tester.h b/test/cctest/compiler/function-tester.h
index c82b7e1dfc..9911f1340d 100644
--- a/test/cctest/compiler/function-tester.h
+++ b/test/cctest/compiler/function-tester.h
@@ -5,7 +5,8 @@
 #ifndef V8_CCTEST_COMPILER_FUNCTION_TESTER_H_
 #define V8_CCTEST_COMPILER_FUNCTION_TESTER_H_
 
-#include "src/ast-numbering.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/scopes.h"
 #include "src/compiler.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/pipeline.h"
@@ -13,9 +14,8 @@
 #include "src/full-codegen/full-codegen.h"
 #include "src/handles.h"
 #include "src/objects-inl.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/test-changes-lowering.cc b/test/cctest/compiler/test-changes-lowering.cc
index 028ac4b7c8..c6ecb5904d 100644
--- a/test/cctest/compiler/test-changes-lowering.cc
+++ b/test/cctest/compiler/test-changes-lowering.cc
@@ -7,6 +7,7 @@
 
 #include <limits>
 
+#include "src/ast/scopes.h"
 #include "src/compiler/change-lowering.h"
 #include "src/compiler/control-builders.h"
 #include "src/compiler/js-graph.h"
@@ -18,9 +19,8 @@
 #include "src/compiler/verifier.h"
 #include "src/execution.h"
 #include "src/globals.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/function-tester.h"
diff --git a/test/cctest/compiler/test-linkage.cc b/test/cctest/compiler/test-linkage.cc
index 2aaf8c766d..034c9b785b 100644
--- a/test/cctest/compiler/test-linkage.cc
+++ b/test/cctest/compiler/test-linkage.cc
@@ -7,7 +7,7 @@
 
 #include "src/code-stubs.h"
 #include "src/compiler.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/zone.h"
 
 #include "src/compiler/common-operator.h"
diff --git a/test/cctest/compiler/test-loop-assignment-analysis.cc b/test/cctest/compiler/test-loop-assignment-analysis.cc
index e1af1626e1..973713ffa5 100644
--- a/test/cctest/compiler/test-loop-assignment-analysis.cc
+++ b/test/cctest/compiler/test-loop-assignment-analysis.cc
@@ -5,10 +5,10 @@
 // TODO(jochen): Remove this after the setting is turned on globally.
 #define V8_IMMINENT_DEPRECATION_WARNINGS
 
+#include "src/ast/scopes.h"
 #include "src/compiler/ast-loop-assignment-analyzer.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/test-pipeline.cc b/test/cctest/compiler/test-pipeline.cc
index c00fa6a331..26ac50222f 100644
--- a/test/cctest/compiler/test-pipeline.cc
+++ b/test/cctest/compiler/test-pipeline.cc
@@ -8,7 +8,7 @@
 #include "src/compiler.h"
 #include "src/compiler/pipeline.h"
 #include "src/handles.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/test-run-bytecode-graph-builder.cc b/test/cctest/compiler/test-run-bytecode-graph-builder.cc
index 248ff4b7ea..4de67c50f9 100644
--- a/test/cctest/compiler/test-run-bytecode-graph-builder.cc
+++ b/test/cctest/compiler/test-run-bytecode-graph-builder.cc
@@ -12,7 +12,7 @@
 #include "src/handles.h"
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/interpreter.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/test-run-stubs.cc b/test/cctest/compiler/test-run-stubs.cc
index c4751c0e28..8f092976d0 100644
--- a/test/cctest/compiler/test-run-stubs.cc
+++ b/test/cctest/compiler/test-run-stubs.cc
@@ -14,7 +14,7 @@
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/pipeline.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "test/cctest/compiler/function-tester.h"
 
 namespace v8 {
diff --git a/test/cctest/compiler/test-simplified-lowering.cc b/test/cctest/compiler/test-simplified-lowering.cc
index aacf38d883..336f2a2594 100644
--- a/test/cctest/compiler/test-simplified-lowering.cc
+++ b/test/cctest/compiler/test-simplified-lowering.cc
@@ -7,6 +7,7 @@
 
 #include <limits>
 
+#include "src/ast/scopes.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/change-lowering.h"
 #include "src/compiler/control-builders.h"
@@ -20,9 +21,8 @@
 #include "src/compiler/typer.h"
 #include "src/compiler/verifier.h"
 #include "src/execution.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/function-tester.h"
diff --git a/test/cctest/expression-type-collector.cc b/test/cctest/expression-type-collector.cc
index e4a5941b96..87f925f139 100644
--- a/test/cctest/expression-type-collector.cc
+++ b/test/cctest/expression-type-collector.cc
@@ -9,9 +9,9 @@
 
 #include "test/cctest/expression-type-collector.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
+#include "src/ast/scopes.h"
 #include "src/codegen.h"
-#include "src/scopes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/test/cctest/expression-type-collector.h b/test/cctest/expression-type-collector.h
index dab1f010cd..37bb9a3c02 100644
--- a/test/cctest/expression-type-collector.h
+++ b/test/cctest/expression-type-collector.h
@@ -5,7 +5,7 @@
 #ifndef V8_EXPRESSION_TYPE_COLLECTOR_H_
 #define V8_EXPRESSION_TYPE_COLLECTOR_H_
 
-#include "src/ast-expression-visitor.h"
+#include "src/ast/ast-expression-visitor.h"
 
 namespace v8 {
 namespace internal {
diff --git a/test/cctest/test-api-interceptors.cc b/test/cctest/test-api-interceptors.cc
index 19f9b400ac..34580296fa 100644
--- a/test/cctest/test-api-interceptors.cc
+++ b/test/cctest/test-api-interceptors.cc
@@ -13,7 +13,7 @@
 #include "src/compilation-cache.h"
 #include "src/execution.h"
 #include "src/objects.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/unicode-inl.h"
 #include "src/utils.h"
 #include "src/vm-state.h"
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 34b563601a..df105e927a 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -46,7 +46,7 @@
 #include "src/execution.h"
 #include "src/futex-emulation.h"
 #include "src/objects.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/unicode-inl.h"
 #include "src/utils.h"
 #include "src/vm-state.h"
diff --git a/test/cctest/test-asm-validator.cc b/test/cctest/test-asm-validator.cc
index 72fe9e0f0e..b4b38eb326 100644
--- a/test/cctest/test-asm-validator.cc
+++ b/test/cctest/test-asm-validator.cc
@@ -7,11 +7,11 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
-#include "src/ast-expression-visitor.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-expression-visitor.h"
+#include "src/ast/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "src/type-cache.h"
 #include "src/typing-asm.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-ast-expression-visitor.cc b/test/cctest/test-ast-expression-visitor.cc
index 8ec5fb0fa7..7b145778bb 100644
--- a/test/cctest/test-ast-expression-visitor.cc
+++ b/test/cctest/test-ast-expression-visitor.cc
@@ -9,11 +9,11 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
-#include "src/ast-expression-visitor.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-expression-visitor.h"
+#include "src/ast/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/expression-type-collector.h"
 #include "test/cctest/expression-type-collector-macros.h"
diff --git a/test/cctest/test-ast.cc b/test/cctest/test-ast.cc
index efb78890d0..f069ad8603 100644
--- a/test/cctest/test-ast.cc
+++ b/test/cctest/test-ast.cc
@@ -32,7 +32,7 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
diff --git a/test/cctest/test-compiler.cc b/test/cctest/test-compiler.cc
index 4db16ee3b2..37d8f89ef7 100644
--- a/test/cctest/test-compiler.cc
+++ b/test/cctest/test-compiler.cc
@@ -35,7 +35,7 @@
 
 #include "src/compiler.h"
 #include "src/disasm.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
diff --git a/test/cctest/test-javascript-arm64.cc b/test/cctest/test-javascript-arm64.cc
index 4c1908d5dc..01cb874f63 100644
--- a/test/cctest/test-javascript-arm64.cc
+++ b/test/cctest/test-javascript-arm64.cc
@@ -37,7 +37,7 @@
 #include "src/compilation-cache.h"
 #include "src/execution.h"
 #include "src/isolate.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/unicode-inl.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-js-arm64-variables.cc b/test/cctest/test-js-arm64-variables.cc
index 24e4cf811c..362d5fce7c 100644
--- a/test/cctest/test-js-arm64-variables.cc
+++ b/test/cctest/test-js-arm64-variables.cc
@@ -39,7 +39,7 @@
 #include "src/compilation-cache.h"
 #include "src/execution.h"
 #include "src/isolate.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/unicode-inl.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-lockers.cc b/test/cctest/test-lockers.cc
index cbca2e2429..8df1251144 100644
--- a/test/cctest/test-lockers.cc
+++ b/test/cctest/test-lockers.cc
@@ -38,7 +38,7 @@
 #include "src/compilation-cache.h"
 #include "src/execution.h"
 #include "src/isolate.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/unicode-inl.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index 4bd308d67a..522c95d5b3 100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -34,18 +34,18 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
-#include "src/ast-numbering.h"
-#include "src/ast-value-factory.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-numbering.h"
+#include "src/ast/ast-value-factory.h"
 #include "src/compiler.h"
 #include "src/execution.h"
 #include "src/isolate.h"
 #include "src/objects.h"
-#include "src/parser.h"
-#include "src/preparser.h"
-#include "src/rewriter.h"
-#include "src/scanner-character-streams.h"
-#include "src/token.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/preparser.h"
+#include "src/parsing/rewriter.h"
+#include "src/parsing/scanner-character-streams.h"
+#include "src/parsing/token.h"
 #include "src/utils.h"
 
 #include "test/cctest/cctest.h"
diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc
index 21d5ad1fba..3fe822505f 100644
--- a/test/cctest/test-regexp.cc
+++ b/test/cctest/test-regexp.cc
@@ -33,10 +33,10 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
+#include "src/ast/ast.h"
 #include "src/char-predicates-inl.h"
 #include "src/ostreams.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-macro-assembler-irregexp.h"
diff --git a/test/cctest/test-serialize.cc b/test/cctest/test-serialize.cc
index 798a8e7fe1..7b0a73613d 100644
--- a/test/cctest/test-serialize.cc
+++ b/test/cctest/test-serialize.cc
@@ -34,14 +34,14 @@
 
 #include "src/v8.h"
 
+#include "src/ast/scopeinfo.h"
 #include "src/bootstrapper.h"
 #include "src/compilation-cache.h"
 #include "src/debug/debug.h"
 #include "src/heap/spaces.h"
 #include "src/objects.h"
-#include "src/parser.h"
+#include "src/parsing/parser.h"
 #include "src/runtime/runtime.h"
-#include "src/scopeinfo.h"
 #include "src/snapshot/natives.h"
 #include "src/snapshot/serialize.h"
 #include "src/snapshot/snapshot.h"
diff --git a/test/cctest/test-typing-reset.cc b/test/cctest/test-typing-reset.cc
index 9102e1fca0..d9725fd2d7 100644
--- a/test/cctest/test-typing-reset.cc
+++ b/test/cctest/test-typing-reset.cc
@@ -9,11 +9,11 @@
 
 #include "src/v8.h"
 
-#include "src/ast.h"
-#include "src/ast-expression-visitor.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/ast/ast.h"
+#include "src/ast/ast-expression-visitor.h"
+#include "src/ast/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
 #include "src/typing-reset.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/function-tester.h"
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 2b729d8e38..fb9679ee28 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -401,16 +401,26 @@
         '../../src/assembler.h',
         '../../src/assert-scope.h',
         '../../src/assert-scope.cc',
-        '../../src/ast-expression-visitor.cc',
-        '../../src/ast-expression-visitor.h',
-        '../../src/ast-literal-reindexer.cc',
-        '../../src/ast-literal-reindexer.h',
-        '../../src/ast-numbering.cc',
-        '../../src/ast-numbering.h',
-        '../../src/ast-value-factory.cc',
-        '../../src/ast-value-factory.h',
-        '../../src/ast.cc',
-        '../../src/ast.h',
+        '../../src/ast/ast-expression-visitor.cc',
+        '../../src/ast/ast-expression-visitor.h',
+        '../../src/ast/ast-literal-reindexer.cc',
+        '../../src/ast/ast-literal-reindexer.h',
+        '../../src/ast/ast-numbering.cc',
+        '../../src/ast/ast-numbering.h',
+        '../../src/ast/ast-value-factory.cc',
+        '../../src/ast/ast-value-factory.h',
+        '../../src/ast/ast.cc',
+        '../../src/ast/ast.h',
+        '../../src/ast/modules.cc',
+        '../../src/ast/modules.h',
+        '../../src/ast/prettyprinter.cc',
+        '../../src/ast/prettyprinter.h',
+        '../../src/ast/scopeinfo.cc',
+        '../../src/ast/scopeinfo.h',
+        '../../src/ast/scopes.cc',
+        '../../src/ast/scopes.h',
+        '../../src/ast/variables.cc',
+        '../../src/ast/variables.h',
         '../../src/atomic-utils.h',
         '../../src/background-parsing-task.cc',
         '../../src/background-parsing-task.h',
@@ -730,7 +740,6 @@
         '../../src/elements.h',
         '../../src/execution.cc',
         '../../src/execution.h',
-        '../../src/expression-classifier.h',
         '../../src/extensions/externalize-string-extension.cc',
         '../../src/extensions/externalize-string-extension.h',
         '../../src/extensions/free-buffer-extension.cc',
@@ -757,8 +766,6 @@
         '../../src/frames.h',
         '../../src/full-codegen/full-codegen.cc',
         '../../src/full-codegen/full-codegen.h',
-        '../../src/func-name-inferrer.cc',
-        '../../src/func-name-inferrer.h',
         '../../src/futex-emulation.cc',
         '../../src/futex-emulation.h',
         '../../src/gdb-jit.cc',
@@ -844,7 +851,6 @@
         '../../src/isolate-inl.h',
         '../../src/isolate.cc',
         '../../src/isolate.h',
-        '../../src/json-parser.h',
         '../../src/json-stringifier.h',
         '../../src/key-accumulator.h',
         '../../src/key-accumulator.cc',
@@ -865,8 +871,6 @@
         '../../src/macro-assembler.h',
         '../../src/messages.cc',
         '../../src/messages.h',
-        '../../src/modules.cc',
-        '../../src/modules.h',
         '../../src/msan.h',
         '../../src/objects-body-descriptors-inl.h',
         '../../src/objects-body-descriptors.h',
@@ -879,20 +883,30 @@
         '../../src/optimizing-compile-dispatcher.h',
         '../../src/ostreams.cc',
         '../../src/ostreams.h',
-        '../../src/parameter-initializer-rewriter.cc',
-        '../../src/parameter-initializer-rewriter.h',
-        '../../src/parser.cc',
-        '../../src/parser.h',
-        '../../src/pattern-rewriter.cc',
+        '../../src/parsing/expression-classifier.h',
+        '../../src/parsing/func-name-inferrer.cc',
+        '../../src/parsing/func-name-inferrer.h',
+        '../../src/parsing/json-parser.h',
+        '../../src/parsing/parameter-initializer-rewriter.cc',
+        '../../src/parsing/parameter-initializer-rewriter.h',
+        '../../src/parsing/parser.cc',
+        '../../src/parsing/parser.h',
+        '../../src/parsing/pattern-rewriter.cc',
+        '../../src/parsing/preparse-data-format.h',
+        '../../src/parsing/preparse-data.cc',
+        '../../src/parsing/preparse-data.h',
+        '../../src/parsing/preparser.cc',
+        '../../src/parsing/preparser.h',
+        '../../src/parsing/rewriter.cc',
+        '../../src/parsing/rewriter.h',
+        '../../src/parsing/scanner-character-streams.cc',
+        '../../src/parsing/scanner-character-streams.h',
+        '../../src/parsing/scanner.cc',
+        '../../src/parsing/scanner.h',
+        '../../src/parsing/token.cc',
+        '../../src/parsing/token.h',
         '../../src/pending-compilation-error-handler.cc',
         '../../src/pending-compilation-error-handler.h',
-        '../../src/preparse-data-format.h',
-        '../../src/preparse-data.cc',
-        '../../src/preparse-data.h',
-        '../../src/preparser.cc',
-        '../../src/preparser.h',
-        '../../src/prettyprinter.cc',
-        '../../src/prettyprinter.h',
         '../../src/profiler/allocation-tracker.cc',
         '../../src/profiler/allocation-tracker.h',
         '../../src/profiler/circular-queue-inl.h',
@@ -937,8 +951,6 @@
         '../../src/regexp/regexp-stack.h',
         '../../src/register-configuration.cc',
         '../../src/register-configuration.h',
-        '../../src/rewriter.cc',
-        '../../src/rewriter.h',
         '../../src/runtime-profiler.cc',
         '../../src/runtime-profiler.h',
         '../../src/runtime/runtime-array.cc',
@@ -977,14 +989,6 @@
         '../../src/runtime/runtime.h',
         '../../src/safepoint-table.cc',
         '../../src/safepoint-table.h',
-        '../../src/scanner-character-streams.cc',
-        '../../src/scanner-character-streams.h',
-        '../../src/scanner.cc',
-        '../../src/scanner.h',
-        '../../src/scopeinfo.cc',
-        '../../src/scopeinfo.h',
-        '../../src/scopes.cc',
-        '../../src/scopes.h',
         '../../src/signature.h',
         '../../src/simulator.h',
         '../../src/small-pointer-list.h',
@@ -1009,8 +1013,6 @@
         '../../src/strtod.h',
         '../../src/ic/stub-cache.cc',
         '../../src/ic/stub-cache.h',
-        '../../src/token.cc',
-        '../../src/token.h',
         '../../src/transitions-inl.h',
         '../../src/transitions.cc',
         '../../src/transitions.h',
@@ -1042,8 +1044,6 @@
         '../../src/v8memory.h',
         '../../src/v8threads.cc',
         '../../src/v8threads.h',
-        '../../src/variables.cc',
-        '../../src/variables.h',
         '../../src/vector.h',
         '../../src/version.cc',
         '../../src/version.h',
diff --git a/tools/parser-shell.cc b/tools/parser-shell.cc
index da874595de..5d4b0cc490 100644
--- a/tools/parser-shell.cc
+++ b/tools/parser-shell.cc
@@ -36,12 +36,12 @@
 #include "include/libplatform/libplatform.h"
 #include "src/api.h"
 #include "src/compiler.h"
-#include "src/scanner-character-streams.h"
+#include "src/parsing/scanner-character-streams.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/preparse-data-format.h"
+#include "src/parsing/preparse-data.h"
+#include "src/parsing/preparser.h"
 #include "tools/shell-utils.h"
-#include "src/parser.h"
-#include "src/preparse-data-format.h"
-#include "src/preparse-data.h"
-#include "src/preparser.h"
 
 using namespace v8::internal;