diff --git a/docs/src/test/kotlin/DocSnippetTests.kt b/docs/src/test/kotlin/DocSnippetTests.kt
index 98e70706..7dc3f21c 100644
--- a/docs/src/test/kotlin/DocSnippetTests.kt
+++ b/docs/src/test/kotlin/DocSnippetTests.kt
@@ -23,7 +23,7 @@ import org.pkl.core.util.IoUtils
 import org.pkl.core.http.HttpClient
 import org.pkl.core.parser.Parser
 import org.pkl.core.parser.ParserError
-import org.pkl.core.parser.ast.ClassProperty
+import org.pkl.core.parser.syntax.ClassProperty
 import org.pkl.core.resource.ResourceReaders
 import java.nio.file.Files
 import kotlin.io.path.isDirectory
@@ -302,7 +302,7 @@ class DocSnippetTestsEngine : HierarchicalTestEngine<DocSnippetTestsEngine.Execu
 
       override fun getType() = Type.TEST
 
-      private val parsed: org.pkl.core.parser.ast.Node by lazy {
+      private val parsed: org.pkl.core.parser.syntax.Node by lazy {
         when (language) {
           "pkl" -> Parser().parseModule(code)
           "pkl-expr" -> Parser().parseExpressionInput(code)
diff --git a/pkl-core/src/main/java/org/pkl/core/ast/builder/AbstractAstBuilder.java b/pkl-core/src/main/java/org/pkl/core/ast/builder/AbstractAstBuilder.java
index 21484c69..3dc1969e 100644
--- a/pkl-core/src/main/java/org/pkl/core/ast/builder/AbstractAstBuilder.java
+++ b/pkl-core/src/main/java/org/pkl/core/ast/builder/AbstractAstBuilder.java
@@ -20,10 +20,10 @@ import com.oracle.truffle.api.source.SourceSection;
 import java.util.List;
 import org.pkl.core.parser.BaseParserVisitor;
 import org.pkl.core.parser.Span;
-import org.pkl.core.parser.ast.DocComment;
-import org.pkl.core.parser.ast.Modifier;
-import org.pkl.core.parser.ast.Modifier.ModifierValue;
-import org.pkl.core.parser.ast.Node;
+import org.pkl.core.parser.syntax.DocComment;
+import org.pkl.core.parser.syntax.Modifier;
+import org.pkl.core.parser.syntax.Modifier.ModifierValue;
+import org.pkl.core.parser.syntax.Node;
 import org.pkl.core.runtime.VmExceptionBuilder;
 import org.pkl.core.util.Nullable;
 
diff --git a/pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java b/pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java
index 41fc8603..0e9a88c1 100644
--- a/pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java
+++ b/pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java
@@ -158,80 +158,80 @@ import org.pkl.core.module.ModuleKeys;
 import org.pkl.core.module.ResolvedModuleKey;
 import org.pkl.core.packages.PackageLoadError;
 import org.pkl.core.parser.Span;
-import org.pkl.core.parser.ast.Annotation;
-import org.pkl.core.parser.ast.ArgumentList;
-import org.pkl.core.parser.ast.Class;
-import org.pkl.core.parser.ast.ClassMethod;
-import org.pkl.core.parser.ast.ClassProperty;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.Expr.AmendsExpr;
-import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr;
-import org.pkl.core.parser.ast.Expr.BoolLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FloatLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr;
-import org.pkl.core.parser.ast.Expr.IfExpr;
-import org.pkl.core.parser.ast.Expr.ImportExpr;
-import org.pkl.core.parser.ast.Expr.IntLiteralExpr;
-import org.pkl.core.parser.ast.Expr.LetExpr;
-import org.pkl.core.parser.ast.Expr.LogicalNotExpr;
-import org.pkl.core.parser.ast.Expr.ModuleExpr;
-import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.NewExpr;
-import org.pkl.core.parser.ast.Expr.NonNullExpr;
-import org.pkl.core.parser.ast.Expr.NullLiteralExpr;
-import org.pkl.core.parser.ast.Expr.OuterExpr;
-import org.pkl.core.parser.ast.Expr.ParenthesizedExpr;
-import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr;
-import org.pkl.core.parser.ast.Expr.ReadExpr;
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.SubscriptExpr;
-import org.pkl.core.parser.ast.Expr.SuperAccessExpr;
-import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr;
-import org.pkl.core.parser.ast.Expr.ThisExpr;
-import org.pkl.core.parser.ast.Expr.ThrowExpr;
-import org.pkl.core.parser.ast.Expr.TraceExpr;
-import org.pkl.core.parser.ast.Expr.TypeCastExpr;
-import org.pkl.core.parser.ast.Expr.TypeCheckExpr;
-import org.pkl.core.parser.ast.Expr.UnaryMinusExpr;
-import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause;
-import org.pkl.core.parser.ast.Identifier;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.Modifier;
-import org.pkl.core.parser.ast.Modifier.ModifierValue;
-import org.pkl.core.parser.ast.Module;
-import org.pkl.core.parser.ast.Node;
-import org.pkl.core.parser.ast.ObjectBody;
-import org.pkl.core.parser.ast.ObjectMember.ForGenerator;
-import org.pkl.core.parser.ast.ObjectMember.MemberPredicate;
-import org.pkl.core.parser.ast.ObjectMember.ObjectElement;
-import org.pkl.core.parser.ast.ObjectMember.ObjectEntry;
-import org.pkl.core.parser.ast.ObjectMember.ObjectMethod;
-import org.pkl.core.parser.ast.ObjectMember.ObjectProperty;
-import org.pkl.core.parser.ast.ObjectMember.ObjectSpread;
-import org.pkl.core.parser.ast.ObjectMember.WhenGenerator;
-import org.pkl.core.parser.ast.Parameter;
-import org.pkl.core.parser.ast.Parameter.TypedIdentifier;
-import org.pkl.core.parser.ast.ParameterList;
-import org.pkl.core.parser.ast.QualifiedIdentifier;
-import org.pkl.core.parser.ast.StringConstant;
-import org.pkl.core.parser.ast.StringPart;
-import org.pkl.core.parser.ast.StringPart.StringChars;
-import org.pkl.core.parser.ast.StringPart.StringInterpolation;
-import org.pkl.core.parser.ast.Type;
-import org.pkl.core.parser.ast.Type.ConstrainedType;
-import org.pkl.core.parser.ast.Type.DeclaredType;
-import org.pkl.core.parser.ast.Type.FunctionType;
-import org.pkl.core.parser.ast.Type.ModuleType;
-import org.pkl.core.parser.ast.Type.NothingType;
-import org.pkl.core.parser.ast.Type.NullableType;
-import org.pkl.core.parser.ast.Type.ParenthesizedType;
-import org.pkl.core.parser.ast.Type.StringConstantType;
-import org.pkl.core.parser.ast.Type.UnionType;
-import org.pkl.core.parser.ast.Type.UnknownType;
-import org.pkl.core.parser.ast.TypeAlias;
-import org.pkl.core.parser.ast.TypeAnnotation;
-import org.pkl.core.parser.ast.TypeParameterList;
+import org.pkl.core.parser.syntax.Annotation;
+import org.pkl.core.parser.syntax.ArgumentList;
+import org.pkl.core.parser.syntax.Class;
+import org.pkl.core.parser.syntax.ClassMethod;
+import org.pkl.core.parser.syntax.ClassProperty;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.Expr.AmendsExpr;
+import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr;
+import org.pkl.core.parser.syntax.Expr.BoolLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FloatLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.IfExpr;
+import org.pkl.core.parser.syntax.Expr.ImportExpr;
+import org.pkl.core.parser.syntax.Expr.IntLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.LetExpr;
+import org.pkl.core.parser.syntax.Expr.LogicalNotExpr;
+import org.pkl.core.parser.syntax.Expr.ModuleExpr;
+import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.NewExpr;
+import org.pkl.core.parser.syntax.Expr.NonNullExpr;
+import org.pkl.core.parser.syntax.Expr.NullLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.OuterExpr;
+import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr;
+import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr;
+import org.pkl.core.parser.syntax.Expr.ReadExpr;
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.SubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.SuperAccessExpr;
+import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.ThisExpr;
+import org.pkl.core.parser.syntax.Expr.ThrowExpr;
+import org.pkl.core.parser.syntax.Expr.TraceExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCastExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCheckExpr;
+import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr;
+import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause;
+import org.pkl.core.parser.syntax.Identifier;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.Modifier;
+import org.pkl.core.parser.syntax.Modifier.ModifierValue;
+import org.pkl.core.parser.syntax.Module;
+import org.pkl.core.parser.syntax.Node;
+import org.pkl.core.parser.syntax.ObjectBody;
+import org.pkl.core.parser.syntax.ObjectMember.ForGenerator;
+import org.pkl.core.parser.syntax.ObjectMember.MemberPredicate;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectElement;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectEntry;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectMethod;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectProperty;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectSpread;
+import org.pkl.core.parser.syntax.ObjectMember.WhenGenerator;
+import org.pkl.core.parser.syntax.Parameter;
+import org.pkl.core.parser.syntax.Parameter.TypedIdentifier;
+import org.pkl.core.parser.syntax.ParameterList;
+import org.pkl.core.parser.syntax.QualifiedIdentifier;
+import org.pkl.core.parser.syntax.StringConstant;
+import org.pkl.core.parser.syntax.StringPart;
+import org.pkl.core.parser.syntax.StringPart.StringChars;
+import org.pkl.core.parser.syntax.StringPart.StringInterpolation;
+import org.pkl.core.parser.syntax.Type;
+import org.pkl.core.parser.syntax.Type.ConstrainedType;
+import org.pkl.core.parser.syntax.Type.DeclaredType;
+import org.pkl.core.parser.syntax.Type.FunctionType;
+import org.pkl.core.parser.syntax.Type.ModuleType;
+import org.pkl.core.parser.syntax.Type.NothingType;
+import org.pkl.core.parser.syntax.Type.NullableType;
+import org.pkl.core.parser.syntax.Type.ParenthesizedType;
+import org.pkl.core.parser.syntax.Type.StringConstantType;
+import org.pkl.core.parser.syntax.Type.UnionType;
+import org.pkl.core.parser.syntax.Type.UnknownType;
+import org.pkl.core.parser.syntax.TypeAlias;
+import org.pkl.core.parser.syntax.TypeAnnotation;
+import org.pkl.core.parser.syntax.TypeParameterList;
 import org.pkl.core.runtime.BaseModule;
 import org.pkl.core.runtime.ModuleInfo;
 import org.pkl.core.runtime.ModuleResolver;
@@ -1097,7 +1097,7 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
     return Pair.of(elementNodes, isConstantNodes);
   }
 
-  public GeneratorMemberNode visitObjectMember(org.pkl.core.parser.ast.ObjectMember member) {
+  public GeneratorMemberNode visitObjectMember(org.pkl.core.parser.syntax.ObjectMember member) {
     return (GeneratorMemberNode) member.accept(this);
   }
 
@@ -2375,7 +2375,7 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
   }
 
   private GeneratorMemberNode[] doVisitGeneratorMemberNodes(
-      List<? extends org.pkl.core.parser.ast.ObjectMember> members) {
+      List<? extends org.pkl.core.parser.syntax.ObjectMember> members) {
     var result = new GeneratorMemberNode[members.size()];
     for (var i = 0; i < result.length; i++) {
       result[i] = visitObjectMember(members.get(i));
@@ -2666,7 +2666,7 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
     }
     var forExprCtx = ctx.parent();
     while (forExprCtx != null
-        && forExprCtx.getClass() != org.pkl.core.parser.ast.ObjectMember.ForGenerator.class) {
+        && forExprCtx.getClass() != org.pkl.core.parser.syntax.ObjectMember.ForGenerator.class) {
       forExprCtx = forExprCtx.parent();
     }
     assert forExprCtx != null;
@@ -2674,7 +2674,7 @@ public class AstBuilder extends AbstractAstBuilder<Object> {
         .evalError(errorMessageKey)
         .withSourceSection(
             createSourceSection(
-                ((org.pkl.core.parser.ast.ObjectMember.ForGenerator) forExprCtx).forSpan()))
+                ((org.pkl.core.parser.syntax.ObjectMember.ForGenerator) forExprCtx).forSpan()))
         .build();
   }
 
diff --git a/pkl-core/src/main/java/org/pkl/core/ast/builder/ImportsAndReadsParser.java b/pkl-core/src/main/java/org/pkl/core/ast/builder/ImportsAndReadsParser.java
index 798bf2c5..8a752be5 100644
--- a/pkl-core/src/main/java/org/pkl/core/ast/builder/ImportsAndReadsParser.java
+++ b/pkl-core/src/main/java/org/pkl/core/ast/builder/ImportsAndReadsParser.java
@@ -26,15 +26,15 @@ import org.pkl.core.module.ModuleKey;
 import org.pkl.core.module.ResolvedModuleKey;
 import org.pkl.core.parser.Parser;
 import org.pkl.core.parser.ParserError;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.Expr.ImportExpr;
-import org.pkl.core.parser.ast.Expr.ReadExpr;
-import org.pkl.core.parser.ast.Expr.ReadType;
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause.Type;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.StringPart.StringChars;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.Expr.ImportExpr;
+import org.pkl.core.parser.syntax.Expr.ReadExpr;
+import org.pkl.core.parser.syntax.Expr.ReadType;
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause.Type;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.StringPart.StringChars;
 import org.pkl.core.runtime.VmExceptionBuilder;
 import org.pkl.core.runtime.VmUtils;
 import org.pkl.core.util.IoUtils;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java b/pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java
index da9f96d5..16425345 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java
@@ -15,80 +15,80 @@
  */
 package org.pkl.core.parser;
 
-import org.pkl.core.parser.ast.Annotation;
-import org.pkl.core.parser.ast.ArgumentList;
-import org.pkl.core.parser.ast.Class;
-import org.pkl.core.parser.ast.ClassBody;
-import org.pkl.core.parser.ast.ClassMethod;
-import org.pkl.core.parser.ast.ClassProperty;
-import org.pkl.core.parser.ast.DocComment;
-import org.pkl.core.parser.ast.Expr.AmendsExpr;
-import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr;
-import org.pkl.core.parser.ast.Expr.BoolLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FloatLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr;
-import org.pkl.core.parser.ast.Expr.IfExpr;
-import org.pkl.core.parser.ast.Expr.ImportExpr;
-import org.pkl.core.parser.ast.Expr.IntLiteralExpr;
-import org.pkl.core.parser.ast.Expr.LetExpr;
-import org.pkl.core.parser.ast.Expr.LogicalNotExpr;
-import org.pkl.core.parser.ast.Expr.ModuleExpr;
-import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.NewExpr;
-import org.pkl.core.parser.ast.Expr.NonNullExpr;
-import org.pkl.core.parser.ast.Expr.NullLiteralExpr;
-import org.pkl.core.parser.ast.Expr.OuterExpr;
-import org.pkl.core.parser.ast.Expr.ParenthesizedExpr;
-import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr;
-import org.pkl.core.parser.ast.Expr.ReadExpr;
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.SubscriptExpr;
-import org.pkl.core.parser.ast.Expr.SuperAccessExpr;
-import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr;
-import org.pkl.core.parser.ast.Expr.ThisExpr;
-import org.pkl.core.parser.ast.Expr.ThrowExpr;
-import org.pkl.core.parser.ast.Expr.TraceExpr;
-import org.pkl.core.parser.ast.Expr.TypeCastExpr;
-import org.pkl.core.parser.ast.Expr.TypeCheckExpr;
-import org.pkl.core.parser.ast.Expr.UnaryMinusExpr;
-import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause;
-import org.pkl.core.parser.ast.Identifier;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.Keyword;
-import org.pkl.core.parser.ast.Modifier;
-import org.pkl.core.parser.ast.ModuleDecl;
-import org.pkl.core.parser.ast.Node;
-import org.pkl.core.parser.ast.ObjectBody;
-import org.pkl.core.parser.ast.ObjectMember.ForGenerator;
-import org.pkl.core.parser.ast.ObjectMember.MemberPredicate;
-import org.pkl.core.parser.ast.ObjectMember.ObjectElement;
-import org.pkl.core.parser.ast.ObjectMember.ObjectEntry;
-import org.pkl.core.parser.ast.ObjectMember.ObjectMethod;
-import org.pkl.core.parser.ast.ObjectMember.ObjectProperty;
-import org.pkl.core.parser.ast.ObjectMember.ObjectSpread;
-import org.pkl.core.parser.ast.ObjectMember.WhenGenerator;
-import org.pkl.core.parser.ast.Parameter;
-import org.pkl.core.parser.ast.ParameterList;
-import org.pkl.core.parser.ast.QualifiedIdentifier;
-import org.pkl.core.parser.ast.ReplInput;
-import org.pkl.core.parser.ast.StringConstant;
-import org.pkl.core.parser.ast.StringPart;
-import org.pkl.core.parser.ast.Type.ConstrainedType;
-import org.pkl.core.parser.ast.Type.DeclaredType;
-import org.pkl.core.parser.ast.Type.FunctionType;
-import org.pkl.core.parser.ast.Type.ModuleType;
-import org.pkl.core.parser.ast.Type.NothingType;
-import org.pkl.core.parser.ast.Type.NullableType;
-import org.pkl.core.parser.ast.Type.ParenthesizedType;
-import org.pkl.core.parser.ast.Type.StringConstantType;
-import org.pkl.core.parser.ast.Type.UnionType;
-import org.pkl.core.parser.ast.Type.UnknownType;
-import org.pkl.core.parser.ast.TypeAlias;
-import org.pkl.core.parser.ast.TypeAnnotation;
-import org.pkl.core.parser.ast.TypeArgumentList;
-import org.pkl.core.parser.ast.TypeParameter;
-import org.pkl.core.parser.ast.TypeParameterList;
+import org.pkl.core.parser.syntax.Annotation;
+import org.pkl.core.parser.syntax.ArgumentList;
+import org.pkl.core.parser.syntax.Class;
+import org.pkl.core.parser.syntax.ClassBody;
+import org.pkl.core.parser.syntax.ClassMethod;
+import org.pkl.core.parser.syntax.ClassProperty;
+import org.pkl.core.parser.syntax.DocComment;
+import org.pkl.core.parser.syntax.Expr.AmendsExpr;
+import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr;
+import org.pkl.core.parser.syntax.Expr.BoolLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FloatLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.IfExpr;
+import org.pkl.core.parser.syntax.Expr.ImportExpr;
+import org.pkl.core.parser.syntax.Expr.IntLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.LetExpr;
+import org.pkl.core.parser.syntax.Expr.LogicalNotExpr;
+import org.pkl.core.parser.syntax.Expr.ModuleExpr;
+import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.NewExpr;
+import org.pkl.core.parser.syntax.Expr.NonNullExpr;
+import org.pkl.core.parser.syntax.Expr.NullLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.OuterExpr;
+import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr;
+import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr;
+import org.pkl.core.parser.syntax.Expr.ReadExpr;
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.SubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.SuperAccessExpr;
+import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.ThisExpr;
+import org.pkl.core.parser.syntax.Expr.ThrowExpr;
+import org.pkl.core.parser.syntax.Expr.TraceExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCastExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCheckExpr;
+import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr;
+import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause;
+import org.pkl.core.parser.syntax.Identifier;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.Keyword;
+import org.pkl.core.parser.syntax.Modifier;
+import org.pkl.core.parser.syntax.ModuleDecl;
+import org.pkl.core.parser.syntax.Node;
+import org.pkl.core.parser.syntax.ObjectBody;
+import org.pkl.core.parser.syntax.ObjectMember.ForGenerator;
+import org.pkl.core.parser.syntax.ObjectMember.MemberPredicate;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectElement;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectEntry;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectMethod;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectProperty;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectSpread;
+import org.pkl.core.parser.syntax.ObjectMember.WhenGenerator;
+import org.pkl.core.parser.syntax.Parameter;
+import org.pkl.core.parser.syntax.ParameterList;
+import org.pkl.core.parser.syntax.QualifiedIdentifier;
+import org.pkl.core.parser.syntax.ReplInput;
+import org.pkl.core.parser.syntax.StringConstant;
+import org.pkl.core.parser.syntax.StringPart;
+import org.pkl.core.parser.syntax.Type.ConstrainedType;
+import org.pkl.core.parser.syntax.Type.DeclaredType;
+import org.pkl.core.parser.syntax.Type.FunctionType;
+import org.pkl.core.parser.syntax.Type.ModuleType;
+import org.pkl.core.parser.syntax.Type.NothingType;
+import org.pkl.core.parser.syntax.Type.NullableType;
+import org.pkl.core.parser.syntax.Type.ParenthesizedType;
+import org.pkl.core.parser.syntax.Type.StringConstantType;
+import org.pkl.core.parser.syntax.Type.UnionType;
+import org.pkl.core.parser.syntax.Type.UnknownType;
+import org.pkl.core.parser.syntax.TypeAlias;
+import org.pkl.core.parser.syntax.TypeAnnotation;
+import org.pkl.core.parser.syntax.TypeArgumentList;
+import org.pkl.core.parser.syntax.TypeParameter;
+import org.pkl.core.parser.syntax.TypeParameterList;
 
 public abstract class BaseParserVisitor<T> implements ParserVisitor<T> {
 
@@ -338,7 +338,7 @@ public abstract class BaseParserVisitor<T> implements ParserVisitor<T> {
   }
 
   @Override
-  public T visitModule(org.pkl.core.parser.ast.Module module) {
+  public T visitModule(org.pkl.core.parser.syntax.Module module) {
     return visitChildren(module);
   }
 
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/OperatorResolver.java b/pkl-core/src/main/java/org/pkl/core/parser/OperatorResolver.java
index 6dc77b56..65aa9fdb 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/OperatorResolver.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/OperatorResolver.java
@@ -17,13 +17,13 @@ package org.pkl.core.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr;
-import org.pkl.core.parser.ast.Expr.OperatorExpr;
-import org.pkl.core.parser.ast.Expr.TypeCastExpr;
-import org.pkl.core.parser.ast.Expr.TypeCheckExpr;
-import org.pkl.core.parser.ast.Expr.TypeExpr;
-import org.pkl.core.parser.ast.Operator;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr;
+import org.pkl.core.parser.syntax.Expr.OperatorExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCastExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCheckExpr;
+import org.pkl.core.parser.syntax.Expr.TypeExpr;
+import org.pkl.core.parser.syntax.Operator;
 import org.pkl.core.util.Nullable;
 
 class OperatorResolver {
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/Parser.java b/pkl-core/src/main/java/org/pkl/core/parser/Parser.java
index 686ea244..d8699f69 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/Parser.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/Parser.java
@@ -21,70 +21,70 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
 import org.pkl.core.PklBugException;
-import org.pkl.core.parser.ast.Annotation;
-import org.pkl.core.parser.ast.ArgumentList;
-import org.pkl.core.parser.ast.Class;
-import org.pkl.core.parser.ast.ClassBody;
-import org.pkl.core.parser.ast.ClassMethod;
-import org.pkl.core.parser.ast.ClassProperty;
-import org.pkl.core.parser.ast.DocComment;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.Expr.AmendsExpr;
-import org.pkl.core.parser.ast.Expr.BoolLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FloatLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr;
-import org.pkl.core.parser.ast.Expr.IfExpr;
-import org.pkl.core.parser.ast.Expr.IntLiteralExpr;
-import org.pkl.core.parser.ast.Expr.LetExpr;
-import org.pkl.core.parser.ast.Expr.LogicalNotExpr;
-import org.pkl.core.parser.ast.Expr.ModuleExpr;
-import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.NewExpr;
-import org.pkl.core.parser.ast.Expr.NonNullExpr;
-import org.pkl.core.parser.ast.Expr.NullLiteralExpr;
-import org.pkl.core.parser.ast.Expr.OperatorExpr;
-import org.pkl.core.parser.ast.Expr.OuterExpr;
-import org.pkl.core.parser.ast.Expr.ParenthesizedExpr;
-import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr;
-import org.pkl.core.parser.ast.Expr.ReadExpr;
-import org.pkl.core.parser.ast.Expr.ReadType;
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.SubscriptExpr;
-import org.pkl.core.parser.ast.Expr.SuperAccessExpr;
-import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr;
-import org.pkl.core.parser.ast.Expr.ThisExpr;
-import org.pkl.core.parser.ast.Expr.ThrowExpr;
-import org.pkl.core.parser.ast.Expr.TraceExpr;
-import org.pkl.core.parser.ast.Expr.UnaryMinusExpr;
-import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause;
-import org.pkl.core.parser.ast.Identifier;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.Keyword;
-import org.pkl.core.parser.ast.Modifier;
-import org.pkl.core.parser.ast.Module;
-import org.pkl.core.parser.ast.ModuleDecl;
-import org.pkl.core.parser.ast.Node;
-import org.pkl.core.parser.ast.ObjectBody;
-import org.pkl.core.parser.ast.ObjectMember;
-import org.pkl.core.parser.ast.Operator;
-import org.pkl.core.parser.ast.Parameter;
-import org.pkl.core.parser.ast.Parameter.TypedIdentifier;
-import org.pkl.core.parser.ast.ParameterList;
-import org.pkl.core.parser.ast.QualifiedIdentifier;
-import org.pkl.core.parser.ast.ReplInput;
-import org.pkl.core.parser.ast.StringConstant;
-import org.pkl.core.parser.ast.StringPart;
-import org.pkl.core.parser.ast.StringPart.StringChars;
-import org.pkl.core.parser.ast.Type;
-import org.pkl.core.parser.ast.Type.DeclaredType;
-import org.pkl.core.parser.ast.Type.ParenthesizedType;
-import org.pkl.core.parser.ast.Type.StringConstantType;
-import org.pkl.core.parser.ast.TypeAlias;
-import org.pkl.core.parser.ast.TypeAnnotation;
-import org.pkl.core.parser.ast.TypeArgumentList;
-import org.pkl.core.parser.ast.TypeParameter;
-import org.pkl.core.parser.ast.TypeParameterList;
+import org.pkl.core.parser.syntax.Annotation;
+import org.pkl.core.parser.syntax.ArgumentList;
+import org.pkl.core.parser.syntax.Class;
+import org.pkl.core.parser.syntax.ClassBody;
+import org.pkl.core.parser.syntax.ClassMethod;
+import org.pkl.core.parser.syntax.ClassProperty;
+import org.pkl.core.parser.syntax.DocComment;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.Expr.AmendsExpr;
+import org.pkl.core.parser.syntax.Expr.BoolLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FloatLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.IfExpr;
+import org.pkl.core.parser.syntax.Expr.IntLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.LetExpr;
+import org.pkl.core.parser.syntax.Expr.LogicalNotExpr;
+import org.pkl.core.parser.syntax.Expr.ModuleExpr;
+import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.NewExpr;
+import org.pkl.core.parser.syntax.Expr.NonNullExpr;
+import org.pkl.core.parser.syntax.Expr.NullLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.OperatorExpr;
+import org.pkl.core.parser.syntax.Expr.OuterExpr;
+import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr;
+import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr;
+import org.pkl.core.parser.syntax.Expr.ReadExpr;
+import org.pkl.core.parser.syntax.Expr.ReadType;
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.SubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.SuperAccessExpr;
+import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.ThisExpr;
+import org.pkl.core.parser.syntax.Expr.ThrowExpr;
+import org.pkl.core.parser.syntax.Expr.TraceExpr;
+import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr;
+import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause;
+import org.pkl.core.parser.syntax.Identifier;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.Keyword;
+import org.pkl.core.parser.syntax.Modifier;
+import org.pkl.core.parser.syntax.Module;
+import org.pkl.core.parser.syntax.ModuleDecl;
+import org.pkl.core.parser.syntax.Node;
+import org.pkl.core.parser.syntax.ObjectBody;
+import org.pkl.core.parser.syntax.ObjectMember;
+import org.pkl.core.parser.syntax.Operator;
+import org.pkl.core.parser.syntax.Parameter;
+import org.pkl.core.parser.syntax.Parameter.TypedIdentifier;
+import org.pkl.core.parser.syntax.ParameterList;
+import org.pkl.core.parser.syntax.QualifiedIdentifier;
+import org.pkl.core.parser.syntax.ReplInput;
+import org.pkl.core.parser.syntax.StringConstant;
+import org.pkl.core.parser.syntax.StringPart;
+import org.pkl.core.parser.syntax.StringPart.StringChars;
+import org.pkl.core.parser.syntax.Type;
+import org.pkl.core.parser.syntax.Type.DeclaredType;
+import org.pkl.core.parser.syntax.Type.ParenthesizedType;
+import org.pkl.core.parser.syntax.Type.StringConstantType;
+import org.pkl.core.parser.syntax.TypeAlias;
+import org.pkl.core.parser.syntax.TypeAnnotation;
+import org.pkl.core.parser.syntax.TypeArgumentList;
+import org.pkl.core.parser.syntax.TypeParameter;
+import org.pkl.core.parser.syntax.TypeParameterList;
 import org.pkl.core.util.ErrorMessages;
 import org.pkl.core.util.Nullable;
 
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ParserError.java b/pkl-core/src/main/java/org/pkl/core/parser/ParserError.java
index 89a2791b..a9d26f2f 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ParserError.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/ParserError.java
@@ -15,7 +15,7 @@
  */
 package org.pkl.core.parser;
 
-import org.pkl.core.parser.ast.Module;
+import org.pkl.core.parser.syntax.Module;
 import org.pkl.core.util.Nullable;
 
 public class ParserError extends RuntimeException {
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java b/pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java
index d5b3f0d5..e3862fd9 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java
@@ -15,64 +15,64 @@
  */
 package org.pkl.core.parser;
 
-import org.pkl.core.parser.ast.Annotation;
-import org.pkl.core.parser.ast.ArgumentList;
-import org.pkl.core.parser.ast.Class;
-import org.pkl.core.parser.ast.ClassBody;
-import org.pkl.core.parser.ast.ClassMethod;
-import org.pkl.core.parser.ast.ClassProperty;
-import org.pkl.core.parser.ast.DocComment;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.Expr.AmendsExpr;
-import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr;
-import org.pkl.core.parser.ast.Expr.BoolLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FloatLiteralExpr;
-import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr;
-import org.pkl.core.parser.ast.Expr.IfExpr;
-import org.pkl.core.parser.ast.Expr.IntLiteralExpr;
-import org.pkl.core.parser.ast.Expr.LetExpr;
-import org.pkl.core.parser.ast.Expr.LogicalNotExpr;
-import org.pkl.core.parser.ast.Expr.ModuleExpr;
-import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.NewExpr;
-import org.pkl.core.parser.ast.Expr.NonNullExpr;
-import org.pkl.core.parser.ast.Expr.NullLiteralExpr;
-import org.pkl.core.parser.ast.Expr.OuterExpr;
-import org.pkl.core.parser.ast.Expr.ParenthesizedExpr;
-import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr;
-import org.pkl.core.parser.ast.Expr.ReadExpr;
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr;
-import org.pkl.core.parser.ast.Expr.SubscriptExpr;
-import org.pkl.core.parser.ast.Expr.SuperAccessExpr;
-import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr;
-import org.pkl.core.parser.ast.Expr.ThisExpr;
-import org.pkl.core.parser.ast.Expr.ThrowExpr;
-import org.pkl.core.parser.ast.Expr.TraceExpr;
-import org.pkl.core.parser.ast.Expr.TypeCastExpr;
-import org.pkl.core.parser.ast.Expr.TypeCheckExpr;
-import org.pkl.core.parser.ast.Expr.UnaryMinusExpr;
-import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr;
-import org.pkl.core.parser.ast.ExtendsOrAmendsClause;
-import org.pkl.core.parser.ast.Identifier;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.Keyword;
-import org.pkl.core.parser.ast.Modifier;
-import org.pkl.core.parser.ast.Module;
-import org.pkl.core.parser.ast.ModuleDecl;
-import org.pkl.core.parser.ast.ObjectBody;
-import org.pkl.core.parser.ast.ObjectMember;
-import org.pkl.core.parser.ast.Parameter;
-import org.pkl.core.parser.ast.ParameterList;
-import org.pkl.core.parser.ast.QualifiedIdentifier;
-import org.pkl.core.parser.ast.ReplInput;
-import org.pkl.core.parser.ast.StringConstant;
-import org.pkl.core.parser.ast.StringPart;
-import org.pkl.core.parser.ast.Type;
-import org.pkl.core.parser.ast.TypeAlias;
-import org.pkl.core.parser.ast.TypeAnnotation;
-import org.pkl.core.parser.ast.TypeArgumentList;
-import org.pkl.core.parser.ast.TypeParameter;
-import org.pkl.core.parser.ast.TypeParameterList;
+import org.pkl.core.parser.syntax.Annotation;
+import org.pkl.core.parser.syntax.ArgumentList;
+import org.pkl.core.parser.syntax.Class;
+import org.pkl.core.parser.syntax.ClassBody;
+import org.pkl.core.parser.syntax.ClassMethod;
+import org.pkl.core.parser.syntax.ClassProperty;
+import org.pkl.core.parser.syntax.DocComment;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.Expr.AmendsExpr;
+import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr;
+import org.pkl.core.parser.syntax.Expr.BoolLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FloatLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.IfExpr;
+import org.pkl.core.parser.syntax.Expr.IntLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.LetExpr;
+import org.pkl.core.parser.syntax.Expr.LogicalNotExpr;
+import org.pkl.core.parser.syntax.Expr.ModuleExpr;
+import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.NewExpr;
+import org.pkl.core.parser.syntax.Expr.NonNullExpr;
+import org.pkl.core.parser.syntax.Expr.NullLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.OuterExpr;
+import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr;
+import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr;
+import org.pkl.core.parser.syntax.Expr.ReadExpr;
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr;
+import org.pkl.core.parser.syntax.Expr.SubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.SuperAccessExpr;
+import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr;
+import org.pkl.core.parser.syntax.Expr.ThisExpr;
+import org.pkl.core.parser.syntax.Expr.ThrowExpr;
+import org.pkl.core.parser.syntax.Expr.TraceExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCastExpr;
+import org.pkl.core.parser.syntax.Expr.TypeCheckExpr;
+import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr;
+import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr;
+import org.pkl.core.parser.syntax.ExtendsOrAmendsClause;
+import org.pkl.core.parser.syntax.Identifier;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.Keyword;
+import org.pkl.core.parser.syntax.Modifier;
+import org.pkl.core.parser.syntax.Module;
+import org.pkl.core.parser.syntax.ModuleDecl;
+import org.pkl.core.parser.syntax.ObjectBody;
+import org.pkl.core.parser.syntax.ObjectMember;
+import org.pkl.core.parser.syntax.Parameter;
+import org.pkl.core.parser.syntax.ParameterList;
+import org.pkl.core.parser.syntax.QualifiedIdentifier;
+import org.pkl.core.parser.syntax.ReplInput;
+import org.pkl.core.parser.syntax.StringConstant;
+import org.pkl.core.parser.syntax.StringPart;
+import org.pkl.core.parser.syntax.Type;
+import org.pkl.core.parser.syntax.TypeAlias;
+import org.pkl.core.parser.syntax.TypeAnnotation;
+import org.pkl.core.parser.syntax.TypeArgumentList;
+import org.pkl.core.parser.syntax.TypeParameter;
+import org.pkl.core.parser.syntax.TypeParameterList;
 
 public interface ParserVisitor<Result> {
 
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/AbstractNode.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/AbstractNode.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/AbstractNode.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/AbstractNode.java
index ede02d23..2ab45219 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/AbstractNode.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/AbstractNode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Annotation.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Annotation.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Annotation.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Annotation.java
index 88c4f17f..e08670e2 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Annotation.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Annotation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ArgumentList.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ArgumentList.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ArgumentList.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ArgumentList.java
index c57542b6..432876ed 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ArgumentList.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ArgumentList.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Class.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Class.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Class.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Class.java
index ea5c524d..846074a4 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Class.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Class.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassBody.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassBody.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ClassBody.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassBody.java
index 06f6fca1..ddfc6827 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassBody.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassBody.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassMethod.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassMethod.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ClassMethod.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassMethod.java
index 68d78209..4ba6d557 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassMethod.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassMethod.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassProperty.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassProperty.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ClassProperty.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassProperty.java
index 7bff4b66..ae4a1996 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ClassProperty.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ClassProperty.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/DocComment.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/DocComment.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/DocComment.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/DocComment.java
index 12095358..a0808110 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/DocComment.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/DocComment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Expr.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Expr.java
similarity index 99%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Expr.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Expr.java
index a3784c1a..58987fc4 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Expr.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Expr.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ExtendsOrAmendsClause.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ExtendsOrAmendsClause.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ExtendsOrAmendsClause.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ExtendsOrAmendsClause.java
index 03346048..4c876c41 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ExtendsOrAmendsClause.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ExtendsOrAmendsClause.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Identifier.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Identifier.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Identifier.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Identifier.java
index daaabffc..09a71462 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Identifier.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Identifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Objects;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ImportClause.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ImportClause.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ImportClause.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ImportClause.java
index d8a57d69..c75a3c69 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ImportClause.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ImportClause.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Keyword.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Keyword.java
similarity index 96%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Keyword.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Keyword.java
index cadda0a3..1f998db1 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Keyword.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Keyword.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import org.pkl.core.parser.ParserVisitor;
 import org.pkl.core.parser.Span;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Modifier.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Modifier.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Modifier.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Modifier.java
index 3f1b92a4..2b47711d 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Modifier.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Modifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Objects;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Module.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Module.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Module.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Module.java
index 9445d493..bd641919 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Module.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Module.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ModuleDecl.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ModuleDecl.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ModuleDecl.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ModuleDecl.java
index c1f1035a..3e096090 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ModuleDecl.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ModuleDecl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Node.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Node.java
similarity index 96%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Node.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Node.java
index 7d7b8856..e0497af9 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Node.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Node.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectBody.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectBody.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectBody.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectBody.java
index 83041c3c..85d21346 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectBody.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectBody.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectMember.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectMember.java
similarity index 99%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectMember.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectMember.java
index 04c829e7..70fe6d7f 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectMember.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ObjectMember.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Operator.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Operator.java
similarity index 95%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Operator.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Operator.java
index 649ef729..af2fcbf6 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Operator.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Operator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 public enum Operator {
   POW,
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Parameter.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Parameter.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Parameter.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Parameter.java
index 151ac89d..d6a4d323 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Parameter.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Parameter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ParameterList.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ParameterList.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ParameterList.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ParameterList.java
index b1a5a45e..402bcf6b 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ParameterList.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ParameterList.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/QualifiedIdentifier.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/QualifiedIdentifier.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/QualifiedIdentifier.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/QualifiedIdentifier.java
index 43d7d5dc..3a69d3db 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/QualifiedIdentifier.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/QualifiedIdentifier.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/ReplInput.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ReplInput.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/ReplInput.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/ReplInput.java
index 7fc15caa..b974dfd4 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/ReplInput.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/ReplInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/StringConstant.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/StringConstant.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/StringConstant.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/StringConstant.java
index 8ad5ece7..05b8cc2f 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/StringConstant.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/StringConstant.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Objects;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/StringPart.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/StringPart.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/StringPart.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/StringPart.java
index b67db17f..07a671d6 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/StringPart.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/StringPart.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/Type.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Type.java
similarity index 99%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/Type.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/Type.java
index e76255af..edd9ef36 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/Type.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/Type.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAlias.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAlias.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAlias.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAlias.java
index 14f90c13..4275c5b5 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAlias.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAlias.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAnnotation.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAnnotation.java
similarity index 96%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAnnotation.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAnnotation.java
index 99c49077..6dd1eaca 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeAnnotation.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeAnnotation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeArgumentList.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeArgumentList.java
similarity index 96%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/TypeArgumentList.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeArgumentList.java
index 563b54fa..e4c402dd 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeArgumentList.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeArgumentList.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameter.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameter.java
similarity index 98%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameter.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameter.java
index 312d06a4..6d1e30f3 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameter.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameterList.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameterList.java
similarity index 97%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameterList.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameterList.java
index 07f156d1..dffeb9bd 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/TypeParameterList.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/TypeParameterList.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import java.util.List;
 import org.pkl.core.parser.ParserVisitor;
diff --git a/pkl-core/src/main/java/org/pkl/core/parser/ast/package-info.java b/pkl-core/src/main/java/org/pkl/core/parser/syntax/package-info.java
similarity index 63%
rename from pkl-core/src/main/java/org/pkl/core/parser/ast/package-info.java
rename to pkl-core/src/main/java/org/pkl/core/parser/syntax/package-info.java
index 9ff7bdc1..1e91ee67 100644
--- a/pkl-core/src/main/java/org/pkl/core/parser/ast/package-info.java
+++ b/pkl-core/src/main/java/org/pkl/core/parser/syntax/package-info.java
@@ -1,4 +1,4 @@
 @NonnullByDefault
-package org.pkl.core.parser.ast;
+package org.pkl.core.parser.syntax;
 
 import org.pkl.core.util.NonnullByDefault;
diff --git a/pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java b/pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java
index 391b9fb2..d772ab87 100644
--- a/pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java
+++ b/pkl-core/src/main/java/org/pkl/core/repl/ReplServer.java
@@ -37,12 +37,12 @@ import org.pkl.core.module.*;
 import org.pkl.core.packages.PackageResolver;
 import org.pkl.core.parser.Parser;
 import org.pkl.core.parser.ParserError;
-import org.pkl.core.parser.ast.Class;
-import org.pkl.core.parser.ast.ClassProperty;
-import org.pkl.core.parser.ast.Expr;
-import org.pkl.core.parser.ast.ImportClause;
-import org.pkl.core.parser.ast.ModuleDecl;
-import org.pkl.core.parser.ast.ReplInput;
+import org.pkl.core.parser.syntax.Class;
+import org.pkl.core.parser.syntax.ClassProperty;
+import org.pkl.core.parser.syntax.Expr;
+import org.pkl.core.parser.syntax.ImportClause;
+import org.pkl.core.parser.syntax.ModuleDecl;
+import org.pkl.core.parser.syntax.ReplInput;
 import org.pkl.core.project.DeclaredDependencies;
 import org.pkl.core.repl.ReplRequest.Eval;
 import org.pkl.core.repl.ReplRequest.Load;
@@ -222,9 +222,9 @@ public class ReplServer implements AutoCloseable {
           }
         } else if (tree instanceof Class clazz) {
           addStaticModuleProperty(builder.visitClass(clazz));
-        } else if (tree instanceof org.pkl.core.parser.ast.TypeAlias typeAlias) {
+        } else if (tree instanceof org.pkl.core.parser.syntax.TypeAlias typeAlias) {
           addStaticModuleProperty(builder.visitTypeAlias(typeAlias));
-        } else if (tree instanceof org.pkl.core.parser.ast.ClassMethod classMethod) {
+        } else if (tree instanceof org.pkl.core.parser.syntax.ClassMethod classMethod) {
           addModuleMethodDef(builder.visitClassMethod(classMethod));
         } else if (tree instanceof ModuleDecl) {
           // do nothing for now
diff --git a/pkl-core/src/main/java/org/pkl/core/runtime/MinPklVersionChecker.java b/pkl-core/src/main/java/org/pkl/core/runtime/MinPklVersionChecker.java
index 696215cc..598bc7ea 100644
--- a/pkl-core/src/main/java/org/pkl/core/runtime/MinPklVersionChecker.java
+++ b/pkl-core/src/main/java/org/pkl/core/runtime/MinPklVersionChecker.java
@@ -18,10 +18,10 @@ package org.pkl.core.runtime;
 import com.oracle.truffle.api.nodes.Node;
 import org.pkl.core.Release;
 import org.pkl.core.Version;
-import org.pkl.core.parser.ast.Module;
-import org.pkl.core.parser.ast.ObjectMember.ObjectProperty;
-import org.pkl.core.parser.ast.Type;
-import org.pkl.core.parser.ast.Type.DeclaredType;
+import org.pkl.core.parser.syntax.Module;
+import org.pkl.core.parser.syntax.ObjectMember.ObjectProperty;
+import org.pkl.core.parser.syntax.Type;
+import org.pkl.core.parser.syntax.Type.DeclaredType;
 import org.pkl.core.util.Nullable;
 
 final class MinPklVersionChecker {
diff --git a/pkl-core/src/main/java/org/pkl/core/runtime/VmLanguage.java b/pkl-core/src/main/java/org/pkl/core/runtime/VmLanguage.java
index 51f8ca67..170bfdb7 100644
--- a/pkl-core/src/main/java/org/pkl/core/runtime/VmLanguage.java
+++ b/pkl-core/src/main/java/org/pkl/core/runtime/VmLanguage.java
@@ -25,7 +25,7 @@ import org.pkl.core.module.ModuleKey;
 import org.pkl.core.module.ResolvedModuleKey;
 import org.pkl.core.parser.Parser;
 import org.pkl.core.parser.ParserError;
-import org.pkl.core.parser.ast.Module;
+import org.pkl.core.parser.syntax.Module;
 import org.pkl.core.util.IoUtils;
 import org.pkl.core.util.Nullable;
 
diff --git a/pkl-core/src/main/java/org/pkl/core/runtime/VmUtils.java b/pkl-core/src/main/java/org/pkl/core/runtime/VmUtils.java
index e4bae953..9198a268 100644
--- a/pkl-core/src/main/java/org/pkl/core/runtime/VmUtils.java
+++ b/pkl-core/src/main/java/org/pkl/core/runtime/VmUtils.java
@@ -58,7 +58,7 @@ import org.pkl.core.module.ModuleKeys;
 import org.pkl.core.module.ResolvedModuleKey;
 import org.pkl.core.parser.Parser;
 import org.pkl.core.parser.ParserError;
-import org.pkl.core.parser.ast.Expr;
+import org.pkl.core.parser.syntax.Expr;
 import org.pkl.core.util.EconomicMaps;
 import org.pkl.core.util.Nullable;
 
diff --git a/pkl-core/src/test/kotlin/org/pkl/core/parser/SexpRenderer.kt b/pkl-core/src/test/kotlin/org/pkl/core/parser/SexpRenderer.kt
index 70ca5b19..e0eac437 100644
--- a/pkl-core/src/test/kotlin/org/pkl/core/parser/SexpRenderer.kt
+++ b/pkl-core/src/test/kotlin/org/pkl/core/parser/SexpRenderer.kt
@@ -15,27 +15,27 @@
  */
 package org.pkl.core.parser
 
-import org.pkl.core.parser.ast.*
-import org.pkl.core.parser.ast.Annotation
-import org.pkl.core.parser.ast.Expr.*
-import org.pkl.core.parser.ast.Expr.ModuleExpr
-import org.pkl.core.parser.ast.ObjectMember.*
-import org.pkl.core.parser.ast.Parameter.TypedIdentifier
-import org.pkl.core.parser.ast.Type.*
+import org.pkl.core.parser.syntax.*
+import org.pkl.core.parser.syntax.Annotation
+import org.pkl.core.parser.syntax.Expr.*
+import org.pkl.core.parser.syntax.Expr.ModuleExpr
+import org.pkl.core.parser.syntax.ObjectMember.*
+import org.pkl.core.parser.syntax.Parameter.TypedIdentifier
+import org.pkl.core.parser.syntax.Type.*
 
 @Suppress("MemberVisibilityCanBePrivate")
 class SexpRenderer {
   private var tab = ""
   private var buf = StringBuilder()
 
-  fun render(mod: org.pkl.core.parser.ast.Module): String {
+  fun render(mod: org.pkl.core.parser.syntax.Module): String {
     renderModule(mod)
     val res = buf.toString()
     reset()
     return res
   }
 
-  fun renderModule(mod: org.pkl.core.parser.ast.Module) {
+  fun renderModule(mod: org.pkl.core.parser.syntax.Module) {
     buf.append(tab)
     buf.append("(module")
     val oldTab = increaseTab()
@@ -1055,7 +1055,7 @@ class SexpRenderer {
   }
 
   companion object {
-    private fun sortModuleEntries(mod: org.pkl.core.parser.ast.Module): List<Node> {
+    private fun sortModuleEntries(mod: org.pkl.core.parser.syntax.Module): List<Node> {
       val res = mutableListOf<Node>()
       res += mod.classes
       res += mod.typeAliases
diff --git a/pkl-core/src/test/kotlin/org/pkl/core/parser/SpanComparison.kt b/pkl-core/src/test/kotlin/org/pkl/core/parser/SpanComparison.kt
index c028e4b6..bdeaeeaf 100644
--- a/pkl-core/src/test/kotlin/org/pkl/core/parser/SpanComparison.kt
+++ b/pkl-core/src/test/kotlin/org/pkl/core/parser/SpanComparison.kt
@@ -19,47 +19,47 @@ import org.antlr.v4.runtime.ParserRuleContext
 import org.antlr.v4.runtime.tree.TerminalNode
 import org.assertj.core.api.SoftAssertions
 import org.pkl.core.parser.antlr.PklParser.*
-import org.pkl.core.parser.ast.*
-import org.pkl.core.parser.ast.Annotation
-import org.pkl.core.parser.ast.Expr.AmendsExpr
-import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr
-import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr
-import org.pkl.core.parser.ast.Expr.IfExpr
-import org.pkl.core.parser.ast.Expr.ImportExpr
-import org.pkl.core.parser.ast.Expr.LetExpr
-import org.pkl.core.parser.ast.Expr.LogicalNotExpr
-import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr
-import org.pkl.core.parser.ast.Expr.NewExpr
-import org.pkl.core.parser.ast.Expr.NonNullExpr
-import org.pkl.core.parser.ast.Expr.ParenthesizedExpr
-import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr
-import org.pkl.core.parser.ast.Expr.ReadExpr
-import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr
-import org.pkl.core.parser.ast.Expr.SubscriptExpr
-import org.pkl.core.parser.ast.Expr.SuperAccessExpr
-import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr
-import org.pkl.core.parser.ast.Expr.ThrowExpr
-import org.pkl.core.parser.ast.Expr.TraceExpr
-import org.pkl.core.parser.ast.Expr.TypeCastExpr
-import org.pkl.core.parser.ast.Expr.TypeCheckExpr
-import org.pkl.core.parser.ast.Expr.UnaryMinusExpr
-import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr
-import org.pkl.core.parser.ast.ObjectMember.ForGenerator
-import org.pkl.core.parser.ast.ObjectMember.MemberPredicate
-import org.pkl.core.parser.ast.ObjectMember.ObjectElement
-import org.pkl.core.parser.ast.ObjectMember.ObjectEntry
-import org.pkl.core.parser.ast.ObjectMember.ObjectMethod
-import org.pkl.core.parser.ast.ObjectMember.ObjectProperty
-import org.pkl.core.parser.ast.ObjectMember.ObjectSpread
-import org.pkl.core.parser.ast.ObjectMember.WhenGenerator
-import org.pkl.core.parser.ast.Parameter.TypedIdentifier
-import org.pkl.core.parser.ast.Type.ConstrainedType
-import org.pkl.core.parser.ast.Type.DeclaredType
-import org.pkl.core.parser.ast.Type.FunctionType
-import org.pkl.core.parser.ast.Type.NullableType
-import org.pkl.core.parser.ast.Type.ParenthesizedType
-import org.pkl.core.parser.ast.Type.StringConstantType
-import org.pkl.core.parser.ast.Type.UnionType
+import org.pkl.core.parser.syntax.*
+import org.pkl.core.parser.syntax.Annotation
+import org.pkl.core.parser.syntax.Expr.AmendsExpr
+import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr
+import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr
+import org.pkl.core.parser.syntax.Expr.IfExpr
+import org.pkl.core.parser.syntax.Expr.ImportExpr
+import org.pkl.core.parser.syntax.Expr.LetExpr
+import org.pkl.core.parser.syntax.Expr.LogicalNotExpr
+import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr
+import org.pkl.core.parser.syntax.Expr.NewExpr
+import org.pkl.core.parser.syntax.Expr.NonNullExpr
+import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr
+import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr
+import org.pkl.core.parser.syntax.Expr.ReadExpr
+import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr
+import org.pkl.core.parser.syntax.Expr.SubscriptExpr
+import org.pkl.core.parser.syntax.Expr.SuperAccessExpr
+import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr
+import org.pkl.core.parser.syntax.Expr.ThrowExpr
+import org.pkl.core.parser.syntax.Expr.TraceExpr
+import org.pkl.core.parser.syntax.Expr.TypeCastExpr
+import org.pkl.core.parser.syntax.Expr.TypeCheckExpr
+import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr
+import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr
+import org.pkl.core.parser.syntax.ObjectMember.ForGenerator
+import org.pkl.core.parser.syntax.ObjectMember.MemberPredicate
+import org.pkl.core.parser.syntax.ObjectMember.ObjectElement
+import org.pkl.core.parser.syntax.ObjectMember.ObjectEntry
+import org.pkl.core.parser.syntax.ObjectMember.ObjectMethod
+import org.pkl.core.parser.syntax.ObjectMember.ObjectProperty
+import org.pkl.core.parser.syntax.ObjectMember.ObjectSpread
+import org.pkl.core.parser.syntax.ObjectMember.WhenGenerator
+import org.pkl.core.parser.syntax.Parameter.TypedIdentifier
+import org.pkl.core.parser.syntax.Type.ConstrainedType
+import org.pkl.core.parser.syntax.Type.DeclaredType
+import org.pkl.core.parser.syntax.Type.FunctionType
+import org.pkl.core.parser.syntax.Type.NullableType
+import org.pkl.core.parser.syntax.Type.ParenthesizedType
+import org.pkl.core.parser.syntax.Type.StringConstantType
+import org.pkl.core.parser.syntax.Type.UnionType
 
 class SpanComparison(val path: String, private val softly: SoftAssertions) {