diff --git a/.gitignore b/.gitignore
index a4d573c..a2fe01f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,6 +248,7 @@ modules.xml
 
 # Package Files #
 *.jar
+!gradle/wrapper/gradle-wrapper.jar
 *.war
 *.nar
 *.ear
diff --git a/README.adoc b/README.adoc
new file mode 100644
index 0000000..473ab07
--- /dev/null
+++ b/README.adoc
@@ -0,0 +1,501 @@
+= PartiQL IR Generator
+:toc:
+
+[frame=none,grid=none,cols="^,^,^,^"]
+|===
+| PIG Generator | PIG Runtime | LICENSE | CI
+
+a| [link=https://search.maven.org/artifact/org.partiql/partiql-ir-generator]
+image::https://maven-badges.herokuapp.com/maven-central/org.partiql/partiql-ir-generator/badge.svg?[PIG Generator]
+
+a| [fit=line,link=https://search.maven.org/artifact/org.partiql/partiql-ir-generator-runtime]
+image::https://maven-badges.herokuapp.com/maven-central/org.partiql/partiql-ir-generator-runtime/badge.svg?[PIG Runtime]
+
+a| [link=https://github.com/partiql/partiql-ir-generator/blob/main/LICENSE]
+image::https://img.shields.io/hexpm/l/plug.svg[License]
+
+a| [link=https://github.com/partiql/partiql-ir-generator/actions?query=workflow%3A%22Build+and+run+tests%22]
+image::https://github.com/partiql/partiql-ir-generator/actions/workflows/build.yml/badge.svg[CI Build]
+
+|===
+
+== About
+
+PIG is a compiler framework, domain modeling tool and code generator for tree data structures such as ASTs (Abstract Syntax Tree), database logical plans, database physical plans, and other intermediate representations.
+Using PIG, the developer concisely defines the structure of a tree by specifying named constraints for every node and its attributes.
+Check out the https://github.com/partiql/partiql-ir-generator/wiki[wiki]!
+
+== CLI
+
+PIG can be used as a command line tool.
+
+=== Installation
+
+* Clone this repository.
+* Check out the tag of the [release](https://github.com/partiql/partiql-ir-generator/releases) you wish to utilize, e.g. `git checkout v1.0.0`
+* Execute `./gradlew install`
+
+After the build completes, the `pig` executable and dependencies will be located in `./pig/build/install/pig/bin/pig`.
+You can move the install to a permanent location and add the executable script to your path.
+For this doc, we'll add an alias for the local path `alias pig=./pig/build/install/pig/bin/pig`.
+
+You can check the version with `pig --version`.
+
+=== PIG 1.x
+
+PIG 1.x introduces a new modeling language and generator which enable features such as:
+
+.Modeling Additions
+* List, Map, and Set Types
+* Int, Float, Double, Bytes, String types
+* Enum Types
+* Imported Types
+* Sum type definition as the variant of a sum type
+* Inline type definitions
+* Scoped type definitions
+* Scoped type names
+
+.Kotlin Specific Features
+* No runtime library
+* Primitives nodes are optional, #79
+* Explicit library mode, #64
+* Visitors use conventional style, #123 #66
+* Nodes have a children construct, enabling recursion without a visitor.
+* Dynamic code generation via poems rather than templating.
+* Generated DSL now uses builders rather than just factory methods
+* Generated DSL allows for a custom factory
+* Jackson databind integration for serializing a tree to arbitrary Jackson formats, #119
+
+==== Breaking Changes
+
+PIG 1.x currently does not support the 0.x modeling language or permuted domains.
+The 0.x language and permuted domains are still accessible via the `legacy` subcommand.
+If an issue is raised, permuted domains may get added to the 1.x language.
+
+==== Usage
+
+[source,shell]
+----
+pig --help
+
+    Usage: pig [-hv] [COMMAND]
+    -h, --help      display this help message
+    -v, --version   Prints current version
+    Commands:
+    generate  PartiQL IR Generator 1.x
+    legacy    PartiQL IR Generator 0.x
+
+pig generate --help
+
+    Usage: pig generate [-h] [COMMAND]
+    PartiQL IR Generator 1.x
+      -h, --help   display this help message
+    Commands:
+      kotlin  Generates Kotlin sources from type universe definitions
+
+
+pig generate kotlin --help
+
+    Usage: pig generate kotlin [-h] [-m=<modifier>] [-o=<out>] [-p=<packageRoot>]
+                           [-u=<id>] [--poems=<poems>[,<poems>...]]... <file>
+    Generates Kotlin sources from type universe definitions
+          <file>            Type definition file
+      -h, --help            display this help message
+      -m, --modifier=<modifier>
+                            Generated node class modifier. Options FINAL, DATA, OPEN
+      -o, --out=<out>       Generated source output directory
+      -p, --package=<packageRoot>
+                            Package root
+          --poems=<poems>[,<poems>...]
+                            Poem templates to apply
+      -u, --universe=<id>   Universe identifier
+----
+
+=== PIG 0.x
+
+PIG 0.x uses a Nanopass style domain modeling language and notably has the ability to define permuted domains.
+If you wish to use these features, the latest version of PIG maintains them under the `legacy` sub-command.
+The https://github.com/partiql/partiql-ir-generator/wiki[wiki] has documentation on the 0.x modeling language and Kotlin target.
+
+The options and command behavior remains the same, only the `legacy` keyword needs to be added as the first argument.
+
+==== Usage
+
+[source,shell]
+----
+pig legacy --help
+
+Usage: legacy [-hv] [-d=<outputDirectory>] [-e=<template>]
+              [-n=<namespace>] [-o=<outputFile>] [-t=<target>] [-u=<universe>]
+              [-f=<domains>[,<domains>...]]...
+
+PartiQL IR Generator 0.x
+  -d, --output-directory=<outputDirectory>
+                          Generated source output directory
+  -e, --template=<template>
+                          Path to an Apache FreeMarker template
+  -f, --domains=<domains>[,<domains>...]
+                          List of domains to generate (comma separated)
+  -h, -?, --help          Prints current version
+  -n, --namespace=<namespace>
+                          Namespace for generated code
+  -o, --output-file=<outputFile>
+                          Generated source output file
+  -t, --target=<target>   Type universe input file
+  -u, --universe=<universe>
+                          Type universe input file
+  -v, --version           Prints current version
+
+Each target requires certain arguments:
+
+   --target=kotlin requires --namespace=<ns> and --output-directory=<out-dir>
+   --target=custom requires --template=<path-to-template> and --output-file=<generated-file>
+   --target=html   requires --output-file=<output-html-file>
+   --target=ion    requires --output-file=<output-ion-file>
+
+Notes:
+
+   If -d or --output-directory is specified and the directory does not exist, it will be created.
+
+Examples:
+
+  pig --target=kotlin \
+      --universe=universe.ion \
+      --output-directory=generated-src \
+      --namespace=org.example.domain
+
+  pig --target=custom \
+      --universe=universe.ion \
+      --output-file=example.txt \
+      --template=template.ftl
+
+  pig --target=ion \
+      --universe=universe.ion \
+      --output-file=example.ion
+----
+
+== Domain Modeling
+
+PIG enables modeling https://en.wikipedia.org/wiki/Algebraic_data_type[algebraic types] using an Ion DSL.
+
+=== Builtin Types
+
+The following Ion values are used to reference a type in a definition.
+
+[source,ion]
+----
+// Scalar Types
+
+bool
+int         // Int32
+long        // Int64
+float       // IEEE 754 (32 bit)
+double      // IEEE 754 (64 bit)
+bytes       // Array of unsigned bytes
+string      // Unicode char sequence
+
+// Collection Types
+
+list::[t]   // List<T>
+set::[t]    // Set<T>
+map::[k,v]  // Map<K,V>
+
+// Optional Annotation
+
+optional::t
+----
+
+=== Defining Types
+
+The basic grammar rules are:
+
+* Annotated Ion lists represent sum types, each element being a variant.
+* Annotated Ion structs represent product types, each key-value pair being a field.
+
+==== Sum Types
+
+A https://en.wikipedia.org/wiki/Tagged_union[sum] type takes one of several defined forms.
+The wiki page has some nice examples in a variety of languages.
+
+[source,ion]
+----
+// sum named `x` with variants `a` and `b`
+x::[
+  a::{ ... },
+  b::{ ... }
+]
+----
+
+==== Product Types
+
+A https://en.wikipedia.org/wiki/Product_type[product] type is some structure with a fixed set of fields.
+
+[source,ion]
+----
+// product named `x` with fields `a` and `b` of type int, string respectively
+x::{
+  a: int,
+  b: string,
+}
+----
+
+===== Optionals
+
+Fields of a product type can be marked as `optional`.
+For example,
+
+[source,ion]
+----
+x::{
+  a: optional::int,
+  b: map::[int,optional::string],
+  c: optional::foo,
+}
+
+foo::[ ... ]
+----
+
+===== Inlines
+
+A product type can contain inline definitions.
+If the definition does not have an identifier symbol, the field name is used.
+
+[source,ion]
+----
+foo::{
+  a: [...],               // inline sum foo.a
+  b: v::[...],            // inline sum foo.v
+  c: optional::[...],     // inline sum foo.c, optional field of foo
+  d: optional::x::[...],  // inline sum foo.v, optional field of foo
+  e: {...},               // inline product foo.e
+  f: y::{...},            // inline product foo.y
+  g: optional::{...},     // inline product foo.g, optional field of foo
+  h: optional::z::{...},  // inline product foo.z, optional field of foo
+}
+----
+
+==== Enum Types
+
+This is a https://en.wikipedia.org/wiki/Enumerated_type[special case of the sum type].
+Each variant is a named value.
+A sum type definition is considered an enum if all variants are symbols matching the regex `[A-Z][A-Z0-9_]*`.
+
+[source,ion]
+----
+// enum named `x` with values A, B, and C
+x::[ A, B, C ]
+----
+
+==== Nested Type Definitions
+
+You can define types within the scope of another using `\_::[]` or `_:[]` syntax.
+For example,
+
+[source,ion]
+----
+// sum x
+x::[
+  a::{ ... }, // variant a
+  b::[ ... ], // variant b
+  _::[
+    foo::{}   // type `x.foo`, but not a variant — just a nested type
+  ]
+]
+
+// product y
+y::{
+  a: int, // field (a,int)
+  _: [
+    bar::{}  // type
+  ]
+}
+----
+
+=== Imported Types
+
+At the top of each definition file, you can specify imports for your generation target.
+Value types within a target's import are target specific.
+
+For example, with the `kotlin` target we use the https://docs.oracle.com/javase/specs/jls/se8/html/jls-13.html=jls-13.1[canonical Java binary name] to reference an external type.
+
+[source,ion]
+----
+imports::{
+  kotlin: [
+    timestamp::'com.amazon.ionelement.api.TimestampElement'
+  ]
+}
+
+// -- `timestamp` can now be referenced
+// -- `bounds` is an inline enum definition with implicit id `my_interval.bounds`
+my_interval::{
+  start: timestamp,
+  end: timestamp,
+  bounds: [
+    INCLUSIVE,
+    EXCLUSIVE,
+    L_EXCLUSIVE,
+    R_EXCLUSIVE
+  ]
+}
+----
+
+=== Local and Root References
+
+Type names need not be globally unique.
+You can refer to a type by its symbol (local reference) or an absolute path (root).
+A type reference path begins with a `.` and is delimited with `.` as well.
+If an Ion symbol is used, the type definition graph will be searched from that reference's position for the _nearest_ definition with that symbol using BFS.
+Scalars are matched first, then definitions, and finally imports.
+
+Here's an example where absolute references are required to achieve the desired behavior.
+
+[source,ion]
+----
+imports::{
+  kotlin: [
+    ion::'com.amazon.ionelement.api.IonElement'
+  ]
+}
+
+range::{
+  start: int,
+  end: int,
+  bounds: bounds    // relative reference, forward declaration not required
+}
+
+bounds::[
+  OPEN,
+  CLOSED
+]
+
+value::[
+  ion::{
+    value: '.ion'   // use '.' for root reference so this isn't self-referential
+  },
+  range::{
+    value: '.range' // ..
+  }
+]
+----
+
+== Code Generation
+
+As of now, 1.x only has a Kotlin target. There are no immediate plans to add additional targets. The 0.x targets remain.
+
+=== Kotlin Target
+
+The Kotlin target has several generation options (known as poems).
+
+* Node class modifier DATA, OPEN, FINAL
+* Visitor
+* Listener
+* Factory / Builders / DSL
+* Jackson Databind
+* Add Ion meta containers to nodes
+
+These can be found in `org.partiql.pig.generator.target.kotlin.poems`.
+
+[source,shell]
+----
+Usage: pig generate kotlin [-h] [-m=<modifier>] [-o=<out>] [-p=<packageRoot>]
+                           [-u=<id>] [--poems=<poems>[,<poems>...]]... <file>
+Generates Kotlin sources from type universe definitions
+      <file>            Type definition file
+  -h, --help            display this help message
+  -m, --modifier=<modifier>
+                        Generated node class modifier. Options FINAL, DATA, OPEN
+  -o, --out=<out>       Generated source output directory
+  -p, --package=<packageRoot>
+                        Package root
+      --poems=<poems>[,<poems>...]
+                        Poem templates to apply
+  -u, --universe=<id>   Universe identifier
+----
+
+==== Basic Example
+
+Here is a short example which shows some features such as
+
+* Sum types
+* Product types
+* Enum types
+* Inline type definitions
+* Local and absolute type references
+* Builtin scalar types
+
+===== Type Definitions
+
+[source,ion]
+----
+expr::[
+  unary::{
+    expr: expr,
+    op: [ ADD, SUB ]
+  },
+  binary::{
+    lhs: expr,
+    rhs: expr,
+    op: [ ADD, SUB, MULT, DIV ]
+  },
+  call::{
+    id: '.expr.id.path',
+    args: list::[expr]
+  },
+  id::[
+    relative::{
+      id: string
+    },
+    path::{
+      id: list::[string]
+    }
+  ]
+]
+----
+
+===== Generated Code
+
+This is the basic template with no additional poems e.g. visitors, listeners, factories, serde, etc.
+A more complex example can be found in the wiki.
+
+[source,kotlin]
+----
+public abstract class ExampleNode
+
+public sealed class Expr : ExampleNode() {
+
+  public data class Unary(
+    public val expr: Expr,
+    public val op: Op
+  ) : Expr() {
+
+    public enum class Op { ADD, SUB, }
+  }
+
+  public data class Binary(
+    public val lhs: Expr,
+    public val rhs: Expr,
+    public val op: Op
+  ) : Expr() {
+
+    public enum class Op {
+      ADD,
+      SUB,
+      MULT,
+      DIV,
+    }
+  }
+
+  public data class Call(
+    public val id: Id.Path,
+    public val args: List<Expr>
+  ) : Expr()
+
+  public sealed class Id : Expr() {
+
+    public data class Relative(public val id: String) : Id()
+
+    public data class Path(public val id: List<String>) : Id()
+  }
+}
+----
diff --git a/README.md b/README.md
deleted file mode 100644
index 4ff7e52..0000000
--- a/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# PartiQL IR Generator
-
-PIG is a compiler framework, domain modeling tool and code generator for tree data structures such as ASTs (Abstract
-Syntax Tree), database logical plans, database physical plans, and other intermediate representations. Using PIG, the
-developer concisely defines the structure of a tree by specifying named constraints for every node and its attributes.
-
-PIG is mature, but its API and the API of the generated Kotlin code is under active development and may change.
-
-[![PIG Generator](https://maven-badges.herokuapp.com/maven-central/org.partiql/partiql-ir-generator/badge.svg?)](https://search.maven.org/artifact/org.partiql/partiql-ir-generator)
-[![PIG Runtime](https://maven-badges.herokuapp.com/maven-central/org.partiql/partiql-ir-generator-runtime/badge.svg?)](https://search.maven.org/artifact/org.partiql/partiql-ir-generator-runtime)
-[![License](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/partiql/partiql-ir-generator/blob/main/LICENSE)
-[![CI Build](https://github.com/partiql/partiql-ir-generator/actions/workflows/build.yml/badge.svg)](https://github.com/partiql/partiql-ir-generator/actions?query=workflow%3A%22Build+and+run+tests%22)
-
-## About
-
-Check out the wiki! — [PartiQL IR Generator Wiki](https://github.com/partiql/partiql-ir-generator/wiki)
-
-## Usage
-
-There are two components of PIG to be aware of
-- [PIG Generator](https://search.maven.org/artifact/org.partiql/partiql-ir-generator)
-- [PIG Runtime](https://search.maven.org/artifact/org.partiql/partiql-ir-generator-runtime)
-
-Both are available in [Maven Central](https://search.maven.org/search?q=partiql-ir-generator), and it is recommended that **you use the same version for both of them.**
-
-### Gradle
-
-```groovy
-plugins {
-    id 'pig-gradle-plugin'
-}
-
-sourceSets {
-    main {
-        pig {
-            // in addition to the default 'src/main/pig'
-            srcDir 'path/to/type/universes'
-        }
-    }
-    test {
-        pig {
-            // in addition to the default 'src/test/pig'
-            srcDir 'path/to/test/type/universes'
-        }
-    }
-}
-
-pig {
-  target = 'kotlin' // required
-  namespace = ... // optional
-  template = ... // optional
-  outDir = 'build/generated-sources/pig/' // default
-}
-```
-
-### Other Build Systems
-
-If you are not using Gradle, it will be necessary to invoke PIG via the command line.
-
-At build time and before compilation of your application or library, the following should be executed:
-
-```
-pig \
-    -u <type universe.ion> \
-    -t kotlin \ 
-    -n <namespace> \ 
-    -o path/to/package/<output file>
-```
-
-- `<type universe.ion>`:  path to the Ion text file containing the type universe
-- `<output file>`: path to the file for the generated code
-- `<namespace>`: the name used in the `package` statement at the top of the output file
-
-Execute: `pig --help` for all command-line options.
-
-### Obtaining the PIG Executable
-
-To obtain the `pig` executable:
-
-- Clone this repository.
-- Check out the tag of the [release](https://github.com/partiql/partiql-ir-generator/releases) you wish to utilize,
-  e.g. `git checkout v0.6.1`
-- Execute `./gradlew assemble`
-
-After the build completes, the `pig` executable and dependencies will be located
-in `./pig/build/install/pig/bin/pig`.
-
-**Finally, make sure that the version of the `partiql-ir-generator-runtime` library that you are using corresponds to
-the version of the executable.**
-
-Verify this with the `--version` command line option of PIG.
-
-## License
-
-This project is licensed under the Apache-2.0 License.
-
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 6158007..62ce519 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,6 +15,7 @@
 
 plugins {
     `kotlin-dsl`
+    id("java-gradle-plugin")
 }
 
 repositories {
@@ -22,9 +23,9 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
-    implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
+    implementation("org.jlleitschuh.gradle:ktlint-gradle:11.3.2")
 }
 
 allprojects {
diff --git a/buildSrc/src/main/kotlin/org/partiql/pig/gradle/publish/PigPublishPlugin.kt b/buildSrc/src/main/kotlin/org/partiql/pig/gradle/publish/PigPublishPlugin.kt
new file mode 100644
index 0000000..9fd4449
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/partiql/pig/gradle/publish/PigPublishPlugin.kt
@@ -0,0 +1,124 @@
+package org.partiql.pig.gradle.publish
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
+import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
+import org.gradle.jvm.tasks.Jar
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.getByName
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.plugins.signing.SigningExtension
+import org.gradle.plugins.signing.SigningPlugin
+import org.jetbrains.dokka.gradle.DokkaPlugin
+import org.jetbrains.dokka.gradle.DokkaTask
+import java.io.File
+
+/**
+ * Gradle plugin to consolidates the following publishing logic
+ * - Maven Publishing
+ * - Signing
+ * - SourcesJar
+ * - Dokka + JavadocJar
+ */
+abstract class PigPublishPlugin : Plugin<Project> {
+
+    override fun apply(target: Project): Unit = with(target) {
+        pluginManager.apply(JavaPlugin::class.java)
+        pluginManager.apply(MavenPublishPlugin::class.java)
+        pluginManager.apply(SigningPlugin::class.java)
+        pluginManager.apply(DokkaPlugin::class.java)
+        val ext = extensions.create("publish", PublishExtension::class.java)
+        target.afterEvaluate { publish(ext) }
+    }
+
+    private fun Project.publish(ext: PublishExtension) {
+        val releaseVersion = !version.toString().endsWith("-SNAPSHOT")
+
+        // Run dokka unless the environment explicitly specifies false
+        val runDokka = (System.getenv()["DOKKA"] != "false") || releaseVersion
+
+        // Include "sources" and "javadoc" in the JAR
+        extensions.getByType(JavaPluginExtension::class.java).run {
+            withSourcesJar()
+            withJavadocJar()
+        }
+
+        tasks.getByName<DokkaTask>("dokkaHtml") {
+            onlyIf { runDokka }
+            outputDirectory.set(File("${buildDir}/javadoc"))
+        }
+
+        // Add dokkaHtml output to the javadocJar
+        tasks.getByName<Jar>("javadocJar") {
+            onlyIf { runDokka }
+            dependsOn(JavaPlugin.CLASSES_TASK_NAME)
+            archiveClassifier.set("javadoc")
+            from(tasks.named("dokkaHtml"))
+        }
+
+        // Setup Maven Central Publishing
+        val publishing = extensions.getByType(PublishingExtension::class.java).apply {
+            publications {
+                create<MavenPublication>("maven") {
+                    artifactId = ext.artifactId
+                    from(components["java"])
+                    pom {
+                        packaging = "jar"
+                        name.set(ext.name)
+                        description.set("The P.I.G. is a code generator for domain models such ASTs and execution plans.")
+                        url.set("git@github.com:partiql/partiql-ir-generator.git")
+                        scm {
+                            connection.set("scm:git@github.com:partiql/partiql-ir-generator.git")
+                            developerConnection.set("scm:git@github.com:partiql/partiql-ir-generator.git")
+                            url.set("git@github.com:partiql/partiql-ir-generator.git")
+                        }
+                        licenses {
+                            license {
+                                name.set("The Apache License, Version 2.0")
+                                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                            }
+                        }
+                        developers {
+                            developer {
+                                name.set("PartiQL Team")
+                                email.set("partiql-dev@amazon.com")
+                                organization.set("PartiQL")
+                                organizationUrl.set("https://github.com/partiql")
+                            }
+                        }
+                    }
+                }
+            }
+            repositories {
+                maven {
+                    url = uri("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2")
+                    credentials {
+                        val ossrhUsername: String by rootProject
+                        val ossrhPassword: String by rootProject
+                        username = ossrhUsername
+                        password = ossrhPassword
+                    }
+                }
+            }
+        }
+
+        // Sign only if publishing to Maven Central
+        extensions.getByType(SigningExtension::class.java).run {
+            setRequired {
+                releaseVersion && gradle.taskGraph.allTasks.any { it is PublishToMavenRepository }
+            }
+            sign(publishing.publications["maven"])
+        }
+    }
+}
+
+abstract class PublishExtension {
+    var artifactId: String = ""
+    var name: String = ""
+}
diff --git a/buildSrc/src/main/kotlin/pig.conventions.gradle.kts b/buildSrc/src/main/kotlin/pig.conventions.gradle.kts
index d21497c..39ad831 100644
--- a/buildSrc/src/main/kotlin/pig.conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/pig.conventions.gradle.kts
@@ -1,3 +1,7 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jlleitschuh.gradle.ktlint.KtlintExtension
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -23,36 +27,62 @@ repositories {
     mavenCentral()
 }
 
-object Versions {
-    val kotlin = "1.4.0"
-    val ion = "1.9.4"
-    val jupiter = "5.6.2"
-    val jvmTarget = JavaVersion.VERSION_1_8
-}
-
 val buildDir = File(rootProject.projectDir, "gradle-build/" + project.name)
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}")
-
-    testImplementation("org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}")
-    testImplementation("org.junit.jupiter:junit-jupiter:${Versions.jupiter}")
+    implementation(Deps.kotlin)
+    testImplementation(Deps.kotlinTest)
+    testImplementation(Deps.kotlinTestJunit)
+    testImplementation(Deps.jupiter)
 }
 
+val generatedSrc = "$buildDir/generated-src"
+
 java {
-    sourceCompatibility = Versions.jvmTarget
-    targetCompatibility = Versions.jvmTarget
+    sourceCompatibility = JavaVersion.toVersion(Versions.javaTarget)
+    targetCompatibility = JavaVersion.toVersion(Versions.javaTarget)
 }
 
 tasks.test {
-    useJUnitPlatform()
+    useJUnitPlatform() // Enable JUnit5
+    jvmArgs.addAll(listOf("-Duser.language=en", "-Duser.country=US"))
+    maxHeapSize = "4g"
+    testLogging {
+        events.add(TestLogEvent.FAILED)
+        exceptionFormat = TestExceptionFormat.FULL
+    }
+    dependsOn(tasks.ktlintCheck)
 }
 
 tasks.compileKotlin {
-    kotlinOptions.jvmTarget = Versions.jvmTarget.toString()
+    kotlinOptions.jvmTarget = Versions.javaTarget
+    kotlinOptions.apiVersion = Versions.kotlinTarget
+    kotlinOptions.languageVersion = Versions.kotlinTarget
 }
 
 tasks.compileTestKotlin {
-    kotlinOptions.jvmTarget = Versions.jvmTarget.toString()
+    kotlinOptions.jvmTarget = Versions.javaTarget
+    kotlinOptions.apiVersion = Versions.kotlinTarget
+    kotlinOptions.languageVersion = Versions.kotlinTarget
+}
+
+configure<KtlintExtension> {
+    filter {
+        exclude { it.file.path.contains(generatedSrc) }
+    }
+}
+
+sourceSets {
+    main {
+        java.srcDir(generatedSrc)
+    }
+}
+
+kotlin.sourceSets {
+    all {
+        // languageSettings.optIn("kotlin.RequiresOptIn")
+    }
+    main {
+        kotlin.srcDir(generatedSrc)
+    }
 }
diff --git a/buildSrc/src/main/kotlin/pig.publish.gradle.kts b/buildSrc/src/main/kotlin/pig.publish.gradle.kts
deleted file mode 100644
index 6d81e32..0000000
--- a/buildSrc/src/main/kotlin/pig.publish.gradle.kts
+++ /dev/null
@@ -1,99 +0,0 @@
-import gradle.kotlin.dsl.accessors._4ba0e6f3f9855dd979d4ade2b5984a53.java
-
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- *  permissions and limitations under the License.
- */
-
-plugins {
-    `maven-publish`
-    id("signing")
-    id("org.jetbrains.dokka")
-}
-
-tasks.dokkaHtml.configure {
-    outputDirectory.set(buildDir.resolve("javadoc"))
-}
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-fun String.mavenName(): String = when (this) {
-    "pig-runtime" -> "PartiQL I.R. Generator (a.k.a P.I.G.) Runtime Library"
-    else -> "PartiQL I.R. Generator (a.k.a P.I.G.)"
-}
-
-fun String.artifactId(): String = name.replace("pig", "partiql-ir-generator")
-
-publishing {
-    publications {
-        create<MavenPublication>(name) {
-            val module = name
-            artifactId = module.artifactId()
-            from(components["java"])
-            pom {
-                url.set("https://partiql.org/")
-                packaging = "jar"
-                name.set(module.mavenName())
-                description.set("The P.I.G. is a code generator for domain models such ASTs and execution plans.")
-                scm {
-                    connection.set("scm:git@github.com:partiql/partiql-ir-generator.git")
-                    developerConnection.set("scm:git@github.com:partiql/partiql-ir-generator.git")
-                    url.set("git@github.com:partiql/partiql-ir-generator.git")
-                    licenses {
-                        license {
-                            name.set("The Apache License, Version 2.0")
-                            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                        }
-                    }
-                    developers {
-                        developer {
-                            name.set("PartiQL Team")
-                            email.set("partiql-team@amazon.com")
-                            organization.set("PartiQL")
-                            organizationUrl.set("https://github.com/partiql")
-                        }
-                    }
-                }
-            }
-        }
-        repositories {
-            maven {
-                url = uri("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2")
-                credentials {
-                    val ossrhUsername: String by rootProject
-                    val ossrhPassword: String by rootProject
-                    username = ossrhUsername
-                    password = ossrhPassword
-                }
-            }
-        }
-    }
-}
-
-val isReleaseVersion = !rootProject.version.toString().endsWith("SNAPSHOT")
-
-signing {
-    sign(publishing.publications[name])
-    isRequired = isReleaseVersion
-    // TODO figure out how to enable this
-    // && gradle.taskGraph.hasTask("publish")
-}
-
-tasks.withType(Sign::class) {
-    onlyIf {
-        isReleaseVersion
-    }
-}
diff --git a/buildSrc/src/main/kotlin/pig.versions.kt b/buildSrc/src/main/kotlin/pig.versions.kt
new file mode 100644
index 0000000..052d149
--- /dev/null
+++ b/buildSrc/src/main/kotlin/pig.versions.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+object Versions {
+    // Language
+    const val kotlin = "1.5.31"
+    const val kotlinTarget = "1.4"
+    const val javaTarget = "1.8"
+    // Dependencies
+    const val dotlin = "1.0.2"
+    const val freemarker = "2.3.30"
+    const val ionJava = "1.9.4"
+    const val ionElement = "1.0.0"
+    const val jline = "3.21.0"
+    const val kasechange = "1.3.0"
+    const val kotlinPoet = "1.8.0" // Kotlin 1.5
+    const val picoCli = "4.7.0"
+    // Testing
+    const val jupiter = "5.6.2"
+}
+
+object Deps {
+    // Language
+    const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}"
+    // Dependencies
+    const val dotlin = "io.github.rchowell:dotlin:${Versions.dotlin}"
+    const val ionElement = "com.amazon.ion:ion-element:${Versions.ionElement}"
+    const val freemarker = "org.freemarker:freemarker:${Versions.freemarker}"
+    const val kasechange = "net.pearx.kasechange:kasechange:${Versions.kasechange}"
+    const val kotlinPoet = "com.squareup:kotlinpoet:${Versions.kotlinPoet}"
+    const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
+    const val picoCli = "info.picocli:picocli:${Versions.picoCli}"
+    // Testing
+    const val kotlinTest = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}"
+    const val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit5:${Versions.kotlin}"
+    const val jupiter = "org.junit.jupiter:junit-jupiter:${Versions.jupiter}"
+}
+
+object Plugins {
+    // PIG
+    const val conventions = "pig.conventions"
+    const val publish = "org.partiql.pig.gradle.publish"
+    // 3P
+    const val application = "org.gradle.application"
+    const val detekt = "io.gitlab.arturbosch.detekt"
+    const val dokka = "org.jetbrains.dokka"
+    const val ktlint = "org.jlleitschuh.gradle.ktlint"
+    const val library = "org.gradle.java-library"
+}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/org.partiql.pig.gradle.publish.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/org.partiql.pig.gradle.publish.properties
new file mode 100644
index 0000000..3f4950f
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/org.partiql.pig.gradle.publish.properties
@@ -0,0 +1 @@
+implementation-class=org.partiql.pig.gradle.publish.PigPublishPlugin
diff --git a/gradle.properties b/gradle.properties
index 52f818a..7d2f9bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.partiql
-version=0.6.2-SNAPSHOT
+version=1.0.0-SNAPSHOT
 # Required for the maven publish plugin--these properties must be present even if they contain placeholder values.
 ossrhUsername=EMPTY
 ossrhPassword=EMPTY
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..c1962a7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..81b8f92 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..aeb74cb 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/pig-gradle-plugin/README.adoc b/pig-gradle-plugin/README.adoc
new file mode 100644
index 0000000..c0e5143
--- /dev/null
+++ b/pig-gradle-plugin/README.adoc
@@ -0,0 +1,33 @@
+= PIG Gradle Plugin
+
+The PIG gradle plugin is for PIG 0.6.2.
+
+== Usage
+[source,groovy]
+----
+plugins {
+    id 'pig-gradle-plugin'
+}
+
+sourceSets {
+    main {
+        pig {
+            // in addition to the default 'src/main/pig'
+            srcDir 'path/to/type/universes'
+        }
+    }
+    test {
+        pig {
+            // in addition to the default 'src/test/pig'
+            srcDir 'path/to/test/type/universes'
+        }
+    }
+}
+
+pig {
+  target = 'kotlin' // required
+  namespace = ... // optional
+  template = ... // optional
+  outDir = 'build/generated-sources/pig/' // default
+}
+----
diff --git a/pig-gradle-plugin/build.gradle.kts b/pig-gradle-plugin/build.gradle.kts
index 2040438..72ab21b 100644
--- a/pig-gradle-plugin/build.gradle.kts
+++ b/pig-gradle-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java-gradle-plugin")
-    id("org.jetbrains.kotlin.jvm") version "1.4.0"
+    id("org.jetbrains.kotlin.jvm") version "1.5.31"
     id("com.gradle.plugin-publish") version "1.1.0"
 }
 
diff --git a/pig-runtime/build.gradle.kts b/pig-runtime/build.gradle.kts
index d189ec7..a5e47d9 100644
--- a/pig-runtime/build.gradle.kts
+++ b/pig-runtime/build.gradle.kts
@@ -14,12 +14,15 @@
  */
 
 plugins {
-    id("pig.conventions")
-    id("pig.publish")
+    id(Plugins.conventions)
+    id(Plugins.publish)
 }
 
-project.description = "The P.I.G. is a code generator for domain models such ASTs and execution plans."
-
 dependencies {
-    api("com.amazon.ion:ion-element:1.0.0")
+    api(Deps.ionElement)
+}
+
+publish {
+    artifactId = "pig-runtime"
+    name = "PartiQL I.R. Generator (a.k.a P.I.G.) Runtime Library"
 }
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/BoolPrimitive.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/BoolPrimitive.kt
similarity index 73%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/BoolPrimitive.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/BoolPrimitive.kt
index 3934d3c..c6c7b5c 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/BoolPrimitive.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/BoolPrimitive.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.MetaContainer
@@ -25,19 +25,19 @@ import com.amazon.ionelement.api.metaContainerOf
  *
  * This is needed to allow such values to have metas.
  */
-class BoolPrimitive(val value: Boolean, override val metas: MetaContainer) : DomainNode {
+class BoolPrimitive(val value: Boolean, override val metas: MetaContainer) : org.partiql.pig.legacy.runtime.DomainNode {
 
     /** Creates a copy of the current node with the specified values. */
-    fun copy(value: Boolean = this.value, metas: MetaContainer = this.metas): BoolPrimitive =
-        BoolPrimitive(value, metas)
+    fun copy(value: Boolean = this.value, metas: MetaContainer = this.metas): org.partiql.pig.legacy.runtime.BoolPrimitive =
+        org.partiql.pig.legacy.runtime.BoolPrimitive(value, metas)
 
     /** Creates a copy of the current [BoolPrimitive] with [metas] as the new metas. */
-    override fun copy(metas: MetaContainer): BoolPrimitive =
-        BoolPrimitive(value, metas)
+    override fun copy(metas: MetaContainer): org.partiql.pig.legacy.runtime.BoolPrimitive =
+        org.partiql.pig.legacy.runtime.BoolPrimitive(value, metas)
 
     /** Creates a copy of the current [BoolPrimitive] with the specified additional meta. */
-    override fun withMeta(metaKey: String, metaValue: Any): BoolPrimitive =
-        BoolPrimitive(this.value, metas + metaContainerOf(metaKey to metaValue))
+    override fun withMeta(metaKey: String, metaValue: Any): org.partiql.pig.legacy.runtime.BoolPrimitive =
+        org.partiql.pig.legacy.runtime.BoolPrimitive(this.value, metas + metaContainerOf(metaKey to metaValue))
 
     /** Creates an [IonElement] representation of the current [BoolPrimitive]. */
     override fun toIonElement(): IonElement = ionBool(value, metas = metas)
@@ -49,7 +49,7 @@ class BoolPrimitive(val value: Boolean, override val metas: MetaContainer) : Dom
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as BoolPrimitive
+        other as org.partiql.pig.legacy.runtime.BoolPrimitive
 
         if (value != other.value) return false
 
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainNode.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainNode.kt
similarity index 97%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainNode.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainNode.kt
index 828e2b7..671d850 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainNode.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainNode.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.MetaContainer
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorBase.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorBase.kt
similarity index 88%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorBase.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorBase.kt
index a1f3a7f..44cba00 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorBase.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorBase.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.MetaContainer
 
 open class DomainVisitorBase {
 
-    protected open fun visitBoolPrimitive(node: BoolPrimitive) {
+    protected open fun visitBoolPrimitive(node: org.partiql.pig.legacy.runtime.BoolPrimitive) {
         // default does nothing
     }
 
@@ -42,7 +42,7 @@ open class DomainVisitorBase {
 
     // /////////////////////////////////////////////////////
 
-    open fun walkBoolPrimitive(node: BoolPrimitive) {
+    open fun walkBoolPrimitive(node: org.partiql.pig.legacy.runtime.BoolPrimitive) {
         visitBoolPrimitive(node)
         walkMetas(node.metas)
     }
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorFoldBase.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorFoldBase.kt
similarity index 89%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorFoldBase.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorFoldBase.kt
index a468393..75d92da 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorFoldBase.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorFoldBase.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.MetaContainer
 
 open class DomainVisitorFoldBase<T> {
 
-    protected open fun visitBoolPrimitive(node: BoolPrimitive, accumulator: T): T =
+    protected open fun visitBoolPrimitive(node: org.partiql.pig.legacy.runtime.BoolPrimitive, accumulator: T): T =
         // default does nothing
         accumulator
 
@@ -42,7 +42,7 @@ open class DomainVisitorFoldBase<T> {
 
     // /////////////////////////////////////////////////////
 
-    open fun walkBoolPrimitive(node: BoolPrimitive, accumulator: T): T {
+    open fun walkBoolPrimitive(node: org.partiql.pig.legacy.runtime.BoolPrimitive, accumulator: T): T {
         val intermediate = visitBoolPrimitive(node, accumulator)
         return walkMetas(node.metas, intermediate)
     }
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorTransformBase.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorTransformBase.kt
similarity index 84%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorTransformBase.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorTransformBase.kt
index 33395b1..9d0cc63 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/DomainVisitorTransformBase.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/DomainVisitorTransformBase.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.MetaContainer
@@ -37,19 +37,19 @@ abstract class DomainVisitorTransformBase {
 
     // bool
 
-    open fun transformBoolPrimitive(b: BoolPrimitive): BoolPrimitive {
+    open fun transformBoolPrimitive(b: org.partiql.pig.legacy.runtime.BoolPrimitive): org.partiql.pig.legacy.runtime.BoolPrimitive {
         val newValue = transformBoolPrimitiveValue(b)
         val newMetas = transformBoolPrimitiveMetas(b)
         return if (b.value != newValue || b.metas !== newMetas) {
-            BoolPrimitive(newValue, newMetas)
+            org.partiql.pig.legacy.runtime.BoolPrimitive(newValue, newMetas)
         } else {
             b
         }
     }
 
-    open fun transformBoolPrimitiveValue(sym: BoolPrimitive): Boolean = sym.value
+    open fun transformBoolPrimitiveValue(sym: org.partiql.pig.legacy.runtime.BoolPrimitive): Boolean = sym.value
 
-    open fun transformBoolPrimitiveMetas(b: BoolPrimitive) = transformMetas(b.metas)
+    open fun transformBoolPrimitiveMetas(b: org.partiql.pig.legacy.runtime.BoolPrimitive) = transformMetas(b.metas)
 
     // long
 
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/ErrorHelpers.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpers.kt
similarity index 97%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/ErrorHelpers.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpers.kt
index e946263..edcf694 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/ErrorHelpers.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpers.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.IonLocation
@@ -90,6 +90,7 @@ fun SexpElement.getOptional(i: Int): AnyElement? {
 }
 
 private fun SexpElement.argIndexInBoundOrMalformed(i: Int) {
-    if (i + 1 >= this.size)
+    if (i + 1 >= this.size) {
         errMalformed(this.metas.location, "Argument index $i is out of bounds (max=${size - 2})")
+    }
 }
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/Experimental.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/Experimental.kt
similarity index 79%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/Experimental.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/Experimental.kt
index a02713c..a7aac79 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/Experimental.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/Experimental.kt
@@ -1,4 +1,4 @@
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 @RequiresOptIn(
     message = "This DomainNode is marked as experimental",
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IntermediateRecord.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecord.kt
similarity index 99%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IntermediateRecord.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecord.kt
index 0d4423f..bb498ac 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IntermediateRecord.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecord.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.IonLocation
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementHelpers.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementHelpers.kt
similarity index 98%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementHelpers.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementHelpers.kt
index 0ddd640..9b4522f 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementHelpers.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementHelpers.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.IonElement
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementTransformerBase.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBase.kt
similarity index 97%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementTransformerBase.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBase.kt
index dde1096..70526b4 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/IonElementTransformerBase.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBase.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.IonElementException
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/LongPrimitive.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/LongPrimitive.kt
similarity index 98%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/LongPrimitive.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/LongPrimitive.kt
index d904bd9..5022e10 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/LongPrimitive.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/LongPrimitive.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.MetaContainer
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MalformedDomainDataException.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MalformedDomainDataException.kt
similarity index 95%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MalformedDomainDataException.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MalformedDomainDataException.kt
index a9a9726..40a6b6d 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MalformedDomainDataException.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MalformedDomainDataException.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonLocation
 import com.amazon.ionelement.api.locationToString
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MetaContainingNode.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MetaContainingNode.kt
similarity index 92%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MetaContainingNode.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MetaContainingNode.kt
index 2a6944e..1f5bcd0 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/MetaContainingNode.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/MetaContainingNode.kt
@@ -7,13 +7,13 @@
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed 
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
- * express or implied. See the License for the specific language governing 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.MetaContainer
 
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/PrimitiveUtils.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/PrimitiveUtils.kt
similarity index 92%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/PrimitiveUtils.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/PrimitiveUtils.kt
index 872670c..e50a2c8 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/PrimitiveUtils.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/PrimitiveUtils.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.emptyMetaContainer
 
 fun AnyElement.toBoolPrimitive() =
-    BoolPrimitive(this.booleanValue, this.metas)
+    org.partiql.pig.legacy.runtime.BoolPrimitive(this.booleanValue, this.metas)
 
 fun AnyElement.toLongPrimitive() =
     LongPrimitive(this.longValue, this.metas)
@@ -29,7 +29,7 @@ fun AnyElement.toSymbolPrimitive() =
     SymbolPrimitive(this.symbolValue, this.metas)
 
 fun Boolean.asPrimitive(metas: MetaContainer = emptyMetaContainer()) =
-    BoolPrimitive(this, metas)
+    org.partiql.pig.legacy.runtime.BoolPrimitive(this, metas)
 
 fun Long.asPrimitive(metas: MetaContainer = emptyMetaContainer()) =
     LongPrimitive(this, metas)
diff --git a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/SymbolPrimitive.kt b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitive.kt
similarity index 98%
rename from pig-runtime/src/main/kotlin/org/partiql/pig/runtime/SymbolPrimitive.kt
rename to pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitive.kt
index 32aef7e..631e7ac 100644
--- a/pig-runtime/src/main/kotlin/org/partiql/pig/runtime/SymbolPrimitive.kt
+++ b/pig-runtime/src/main/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitive.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.MetaContainer
diff --git a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/ErrorHelpersTests.kt b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpersTests.kt
similarity index 98%
rename from pig-runtime/src/test/kotlin/org/partiql/pig/runtime/ErrorHelpersTests.kt
rename to pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpersTests.kt
index 6824d10..3c287d5 100644
--- a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/ErrorHelpersTests.kt
+++ b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/ErrorHelpersTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.ElementType
 import com.amazon.ionelement.api.ionInt
@@ -33,7 +33,6 @@ class ErrorHelpersTests {
 
     @Test
     fun requireArityOrMalformed() {
-
         assertThrows<MalformedDomainDataException> {
             someSexp.requireArityOrMalformed(1)
         }.also {
diff --git a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IntermediateRecordTests.kt b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecordTests.kt
similarity index 99%
rename from pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IntermediateRecordTests.kt
rename to pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecordTests.kt
index 7a0d16e..50f6b12 100644
--- a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IntermediateRecordTests.kt
+++ b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IntermediateRecordTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.IonElementLoaderOptions
@@ -34,7 +34,6 @@ class IntermediateRecordTests {
 
     @Test
     fun happyPath() {
-
         val someRecord = """
             (some_record
                 (foo 1)
diff --git a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IonElementTransformerBaseTests.kt b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBaseTests.kt
similarity index 99%
rename from pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IonElementTransformerBaseTests.kt
rename to pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBaseTests.kt
index 24fc19f..b380353 100644
--- a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/IonElementTransformerBaseTests.kt
+++ b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/IonElementTransformerBaseTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.IonElementConstraintException
diff --git a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/LongPrimitiveTests.kt b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/LongPrimitiveTests.kt
similarity index 98%
rename from pig-runtime/src/test/kotlin/org/partiql/pig/runtime/LongPrimitiveTests.kt
rename to pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/LongPrimitiveTests.kt
index 188a8be..b61f465 100644
--- a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/LongPrimitiveTests.kt
+++ b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/LongPrimitiveTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.emptyMetaContainer
 import com.amazon.ionelement.api.ionInt
diff --git a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/SymbolPrimitiveTests.kt b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitiveTests.kt
similarity index 98%
rename from pig-runtime/src/test/kotlin/org/partiql/pig/runtime/SymbolPrimitiveTests.kt
rename to pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitiveTests.kt
index 0cdcfc5..6df7023 100644
--- a/pig-runtime/src/test/kotlin/org/partiql/pig/runtime/SymbolPrimitiveTests.kt
+++ b/pig-runtime/src/test/kotlin/org/partiql/pig/legacy/runtime/SymbolPrimitiveTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.runtime
+package org.partiql.pig.legacy.runtime
 
 import com.amazon.ionelement.api.emptyMetaContainer
 import com.amazon.ionelement.api.ionSymbol
diff --git a/pig-tests/build.gradle.kts b/pig-tests/build.gradle.kts
index 4e4a292..f078b72 100644
--- a/pig-tests/build.gradle.kts
+++ b/pig-tests/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.nio.file.Paths
+
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -15,7 +17,6 @@
 
 plugins {
     id("pig.conventions")
-    id("org.partiql.pig.pig-gradle-plugin")
     id("java-library")
 }
 
@@ -23,24 +24,65 @@ dependencies {
     implementation(project(":pig-runtime"))
 }
 
-// remove after pig-example is created
-val pigOutputDir = file("./src/main/kotlin/org/partiql/pig/tests/generated/")
+// remove once pig-gradle-plugin is updated
+tasks {
 
-pig {
-    namespace = "org.partiql.pig.tests.generated"
-    // remove after pig-example is created
-    outputDir = pigOutputDir
-}
+    val pigOutputDir = "src/main/kotlin/org/partiql/pig/legacy/tests/generated/"
+    val pigOutputPackage = "org.partiql.pig.legacy.tests.generated"
+    val pigInputDir = "src/test/pig/"
+    val universes = listOf("toy-lang", "sample-universe", "partiql-basic")
+
+    val pigClean = register("pig-clean", Delete::class) {
+        group = "pig"
+        description = "deletes all pig generated files"
+        delete(
+            fileTree(pigOutputDir).matching {
+                include("*.generated.kt")
+            }
+        )
+    }
 
-// remove after pig-example is created
-tasks.register("pigClean", Delete::class) {
-    group = "pig"
-    description = "deletes all pig generated files"
-    delete(
-        fileTree(pigOutputDir).matching {
-            include("*.generated.kt")
+    val pigAll = register("pig-all") {
+        group = "pig"
+        description = "run all pig generation tasks"
+        shouldRunAfter(pigClean)
+    }
+
+    named("compileKotlin") {
+        dependsOn(pigAll)
+    }
+
+    // :pig:installDist creates the pig jar launch script required for `exec`
+    val installDist = project(":pig").tasks.named("install")
+
+    universes.forEach { u ->
+        val t = register("pig-generate-$u") {
+            group = "pig"
+            description = "pig generation for type universe $u"
+            dependsOn(installDist)
+
+            // pig script from :pig:install
+            val pathToPig = File(projectDir, "../pig/build/install/pig/bin/pig").canonicalPath
+            val pathToUniverse = Paths.get(projectDir.toString(), pigInputDir, "$u.ion")
+
+            doLast {
+                exec {
+                    workingDir = projectDir
+                    commandLine(
+                        pathToPig,
+                        "legacy", // invoke 0.x
+                        "-u", pathToUniverse,
+                        "-t", "kotlin",
+                        "-n", pigOutputPackage,
+                        "-d", pigOutputDir
+                    )
+                }
+            }
+        }
+        pigAll {
+            dependsOn(t)
         }
-    )
+    }
 }
 
 configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/CalculatorAst.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/CalculatorAst.generated.kt
similarity index 99%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/CalculatorAst.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/CalculatorAst.generated.kt
index f914c38..304c024 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/CalculatorAst.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/CalculatorAst.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class CalculatorAst private constructor() {
@@ -111,7 +111,7 @@ class CalculatorAst private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun lit_(
-            value: org.partiql.pig.runtime.LongPrimitive,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): CalculatorAst.Expr.Lit =
             CalculatorAst.Expr.Lit(
@@ -345,7 +345,7 @@ class CalculatorAst private constructor() {
             }
     
         class Lit(
-            val value: org.partiql.pig.runtime.LongPrimitive,
+            val value: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -368,7 +368,7 @@ class CalculatorAst private constructor() {
             }
         
             fun copy(
-                value: org.partiql.pig.runtime.LongPrimitive = this.value,
+                value: org.partiql.pig.legacy.runtime.LongPrimitive = this.value,
                 metas: MetaContainer = this.metas
             ) =
                 Lit(
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainA.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainA.generated.kt
similarity index 97%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainA.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainA.generated.kt
index 9b6cd57..be22195 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainA.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainA.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class DomainA private constructor() {
@@ -55,7 +55,7 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun productToRemove_(
-            whatever: org.partiql.pig.runtime.SymbolPrimitive,
+            whatever: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.ProductToRemove =
             DomainA.ProductToRemove(
@@ -84,7 +84,7 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun recordToRemove_(
-            irrelevant: org.partiql.pig.runtime.LongPrimitive,
+            irrelevant: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.RecordToRemove =
             DomainA.RecordToRemove(
@@ -115,7 +115,7 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun productA_(
-            one: org.partiql.pig.runtime.LongPrimitive,
+            one: org.partiql.pig.legacy.runtime.LongPrimitive,
             two: ProductToRemove,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.ProductA =
@@ -148,7 +148,7 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun recordA_(
-            one: org.partiql.pig.runtime.LongPrimitive,
+            one: org.partiql.pig.legacy.runtime.LongPrimitive,
             two: ProductToRemove,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.RecordA =
@@ -181,8 +181,8 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedProduct_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.UnpermutedProduct =
             DomainA.UnpermutedProduct(
@@ -214,8 +214,8 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedRecord_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.UnpermutedRecord =
             DomainA.UnpermutedRecord(
@@ -343,7 +343,7 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun willBeReplaced_(
-            something: org.partiql.pig.runtime.LongPrimitive,
+            something: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.SumB.WillBeReplaced =
             DomainA.SumB.WillBeReplaced(
@@ -375,8 +375,8 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedProductVariant_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.UnpermutedSum.UnpermutedProductVariant =
             DomainA.UnpermutedSum.UnpermutedProductVariant(
@@ -408,8 +408,8 @@ class DomainA private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedRecordVariant_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainA.UnpermutedSum.UnpermutedRecordVariant =
             DomainA.UnpermutedSum.UnpermutedRecordVariant(
@@ -435,7 +435,7 @@ class DomainA private constructor() {
     // Tuple Types
     /////////////////////////////////////////////////////////////////////////////
     class ProductToRemove(
-        val whatever: org.partiql.pig.runtime.SymbolPrimitive,
+        val whatever: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
     
@@ -458,7 +458,7 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            whatever: org.partiql.pig.runtime.SymbolPrimitive = this.whatever,
+            whatever: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.whatever,
             metas: MetaContainer = this.metas
         ) =
             ProductToRemove(
@@ -484,7 +484,7 @@ class DomainA private constructor() {
     }
     
     class RecordToRemove(
-        val irrelevant: org.partiql.pig.runtime.LongPrimitive,
+        val irrelevant: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
     
@@ -508,7 +508,7 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            irrelevant: org.partiql.pig.runtime.LongPrimitive = this.irrelevant,
+            irrelevant: org.partiql.pig.legacy.runtime.LongPrimitive = this.irrelevant,
             metas: MetaContainer = this.metas
         ) =
             RecordToRemove(
@@ -534,7 +534,7 @@ class DomainA private constructor() {
     }
     
     class ProductA(
-        val one: org.partiql.pig.runtime.LongPrimitive,
+        val one: org.partiql.pig.legacy.runtime.LongPrimitive,
         val two: ProductToRemove,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
@@ -561,7 +561,7 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            one: org.partiql.pig.runtime.LongPrimitive = this.one,
+            one: org.partiql.pig.legacy.runtime.LongPrimitive = this.one,
             two: ProductToRemove = this.two,
             metas: MetaContainer = this.metas
         ) =
@@ -591,7 +591,7 @@ class DomainA private constructor() {
     }
     
     class RecordA(
-        val one: org.partiql.pig.runtime.LongPrimitive,
+        val one: org.partiql.pig.legacy.runtime.LongPrimitive,
         val two: ProductToRemove,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
@@ -619,7 +619,7 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            one: org.partiql.pig.runtime.LongPrimitive = this.one,
+            one: org.partiql.pig.legacy.runtime.LongPrimitive = this.one,
             two: ProductToRemove = this.two,
             metas: MetaContainer = this.metas
         ) =
@@ -649,8 +649,8 @@ class DomainA private constructor() {
     }
     
     class UnpermutedProduct(
-        val foo: org.partiql.pig.runtime.SymbolPrimitive,
-        val bar: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
     
@@ -676,8 +676,8 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-            bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
             metas: MetaContainer = this.metas
         ) =
             UnpermutedProduct(
@@ -706,8 +706,8 @@ class DomainA private constructor() {
     }
     
     class UnpermutedRecord(
-        val foo: org.partiql.pig.runtime.SymbolPrimitive,
-        val bar: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainANode() {
     
@@ -734,8 +734,8 @@ class DomainA private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-            bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
             metas: MetaContainer = this.metas
         ) =
             UnpermutedRecord(
@@ -1137,7 +1137,7 @@ class DomainA private constructor() {
         }
     
         class WillBeReplaced(
-            val something: org.partiql.pig.runtime.LongPrimitive,
+            val something: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): SumB() {
         
@@ -1160,7 +1160,7 @@ class DomainA private constructor() {
             }
         
             fun copy(
-                something: org.partiql.pig.runtime.LongPrimitive = this.something,
+                something: org.partiql.pig.legacy.runtime.LongPrimitive = this.something,
                 metas: MetaContainer = this.metas
             ) =
                 WillBeReplaced(
@@ -1207,8 +1207,8 @@ class DomainA private constructor() {
             }
     
         class UnpermutedProductVariant(
-            val foo: org.partiql.pig.runtime.SymbolPrimitive,
-            val bar: org.partiql.pig.runtime.LongPrimitive,
+            val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): UnpermutedSum() {
         
@@ -1234,8 +1234,8 @@ class DomainA private constructor() {
             }
         
             fun copy(
-                foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-                bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+                foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+                bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
                 metas: MetaContainer = this.metas
             ) =
                 UnpermutedProductVariant(
@@ -1264,8 +1264,8 @@ class DomainA private constructor() {
         }
     
         class UnpermutedRecordVariant(
-            val foo: org.partiql.pig.runtime.SymbolPrimitive,
-            val bar: org.partiql.pig.runtime.LongPrimitive,
+            val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): UnpermutedSum() {
         
@@ -1292,8 +1292,8 @@ class DomainA private constructor() {
             }
         
             fun copy(
-                foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-                bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+                foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+                bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
                 metas: MetaContainer = this.metas
             ) =
                 UnpermutedRecordVariant(
@@ -1551,41 +1551,35 @@ class DomainA private constructor() {
             walkSymbolPrimitive(node.whatever)
             walkMetas(node.metas)
         }
-    
         open fun walkRecordToRemove(node: DomainA.RecordToRemove) {
             visitRecordToRemove(node)
             walkLongPrimitive(node.irrelevant)
             walkMetas(node.metas)
         }
-    
         open fun walkProductA(node: DomainA.ProductA) {
             visitProductA(node)
             walkLongPrimitive(node.one)
             walkProductToRemove(node.two)
             walkMetas(node.metas)
         }
-    
         open fun walkRecordA(node: DomainA.RecordA) {
             visitRecordA(node)
             walkLongPrimitive(node.one)
             walkProductToRemove(node.two)
             walkMetas(node.metas)
         }
-    
         open fun walkUnpermutedProduct(node: DomainA.UnpermutedProduct) {
             visitUnpermutedProduct(node)
             walkSymbolPrimitive(node.foo)
             walkLongPrimitive(node.bar)
             walkMetas(node.metas)
         }
-    
         open fun walkUnpermutedRecord(node: DomainA.UnpermutedRecord) {
             visitUnpermutedRecord(node)
             walkSymbolPrimitive(node.foo)
             walkLongPrimitive(node.bar)
             walkMetas(node.metas)
         }
-    
         //////////////////////////////////////
         // Sum Type: SumToRemove
         //////////////////////////////////////
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainAToDomainB.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainAToDomainB.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainAToDomainB.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainAToDomainB.generated.kt
index 175878b..b6710b7 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainAToDomainB.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainAToDomainB.generated.kt
@@ -8,10 +8,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 abstract class DomainAToDomainBVisitorTransform : DomainVisitorTransformBase() {
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainB.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainB.generated.kt
similarity index 95%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainB.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainB.generated.kt
index e9e0c49..b9f7494 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/DomainB.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/DomainB.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class DomainB private constructor() {
@@ -57,8 +57,8 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedProduct_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.UnpermutedProduct =
             DomainB.UnpermutedProduct(
@@ -90,8 +90,8 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedRecord_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.UnpermutedRecord =
             DomainB.UnpermutedRecord(
@@ -121,7 +121,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun productA_(
-            one: org.partiql.pig.runtime.SymbolPrimitive,
+            one: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.ProductA =
             DomainB.ProductA(
@@ -150,7 +150,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun recordA_(
-            one: org.partiql.pig.runtime.SymbolPrimitive,
+            one: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.RecordA =
             DomainB.RecordA(
@@ -179,7 +179,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun sumToReplaceWithProduct_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.SumToReplaceWithProduct =
             DomainB.SumToReplaceWithProduct(
@@ -208,7 +208,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun newProduct_(
-            foo: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.NewProduct =
             DomainB.NewProduct(
@@ -237,7 +237,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun newRecord_(
-            foo: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.NewRecord =
             DomainB.NewRecord(
@@ -269,8 +269,8 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedProductVariant_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.UnpermutedSum.UnpermutedProductVariant =
             DomainB.UnpermutedSum.UnpermutedProductVariant(
@@ -302,8 +302,8 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun unpermutedRecordVariant_(
-            foo: org.partiql.pig.runtime.SymbolPrimitive,
-            bar: org.partiql.pig.runtime.LongPrimitive,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.UnpermutedSum.UnpermutedRecordVariant =
             DomainB.UnpermutedSum.UnpermutedRecordVariant(
@@ -345,7 +345,7 @@ class DomainB private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun willBeReplaced_(
-            something: org.partiql.pig.runtime.SymbolPrimitive,
+            something: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): DomainB.SumB.WillBeReplaced =
             DomainB.SumB.WillBeReplaced(
@@ -393,8 +393,8 @@ class DomainB private constructor() {
     // Tuple Types
     /////////////////////////////////////////////////////////////////////////////
     class UnpermutedProduct(
-        val foo: org.partiql.pig.runtime.SymbolPrimitive,
-        val bar: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -420,8 +420,8 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-            bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
             metas: MetaContainer = this.metas
         ) =
             UnpermutedProduct(
@@ -450,8 +450,8 @@ class DomainB private constructor() {
     }
     
     class UnpermutedRecord(
-        val foo: org.partiql.pig.runtime.SymbolPrimitive,
-        val bar: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -478,8 +478,8 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-            bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+            bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
             metas: MetaContainer = this.metas
         ) =
             UnpermutedRecord(
@@ -508,7 +508,7 @@ class DomainB private constructor() {
     }
     
     class ProductA(
-        val one: org.partiql.pig.runtime.SymbolPrimitive,
+        val one: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -531,7 +531,7 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            one: org.partiql.pig.runtime.SymbolPrimitive = this.one,
+            one: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.one,
             metas: MetaContainer = this.metas
         ) =
             ProductA(
@@ -557,7 +557,7 @@ class DomainB private constructor() {
     }
     
     class RecordA(
-        val one: org.partiql.pig.runtime.SymbolPrimitive,
+        val one: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -581,7 +581,7 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            one: org.partiql.pig.runtime.SymbolPrimitive = this.one,
+            one: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.one,
             metas: MetaContainer = this.metas
         ) =
             RecordA(
@@ -607,7 +607,7 @@ class DomainB private constructor() {
     }
     
     class SumToReplaceWithProduct(
-        val foo: org.partiql.pig.runtime.SymbolPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -630,7 +630,7 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
+            foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
             metas: MetaContainer = this.metas
         ) =
             SumToReplaceWithProduct(
@@ -656,7 +656,7 @@ class DomainB private constructor() {
     }
     
     class NewProduct(
-        val foo: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -679,7 +679,7 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.LongPrimitive = this.foo,
+            foo: org.partiql.pig.legacy.runtime.LongPrimitive = this.foo,
             metas: MetaContainer = this.metas
         ) =
             NewProduct(
@@ -705,7 +705,7 @@ class DomainB private constructor() {
     }
     
     class NewRecord(
-        val foo: org.partiql.pig.runtime.LongPrimitive,
+        val foo: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): DomainBNode() {
     
@@ -729,7 +729,7 @@ class DomainB private constructor() {
         }
     
         fun copy(
-            foo: org.partiql.pig.runtime.LongPrimitive = this.foo,
+            foo: org.partiql.pig.legacy.runtime.LongPrimitive = this.foo,
             metas: MetaContainer = this.metas
         ) =
             NewRecord(
@@ -767,8 +767,8 @@ class DomainB private constructor() {
             }
     
         class UnpermutedProductVariant(
-            val foo: org.partiql.pig.runtime.SymbolPrimitive,
-            val bar: org.partiql.pig.runtime.LongPrimitive,
+            val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): UnpermutedSum() {
         
@@ -794,8 +794,8 @@ class DomainB private constructor() {
             }
         
             fun copy(
-                foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-                bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+                foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+                bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
                 metas: MetaContainer = this.metas
             ) =
                 UnpermutedProductVariant(
@@ -824,8 +824,8 @@ class DomainB private constructor() {
         }
     
         class UnpermutedRecordVariant(
-            val foo: org.partiql.pig.runtime.SymbolPrimitive,
-            val bar: org.partiql.pig.runtime.LongPrimitive,
+            val foo: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val bar: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): UnpermutedSum() {
         
@@ -852,8 +852,8 @@ class DomainB private constructor() {
             }
         
             fun copy(
-                foo: org.partiql.pig.runtime.SymbolPrimitive = this.foo,
-                bar: org.partiql.pig.runtime.LongPrimitive = this.bar,
+                foo: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.foo,
+                bar: org.partiql.pig.legacy.runtime.LongPrimitive = this.bar,
                 metas: MetaContainer = this.metas
             ) =
                 UnpermutedRecordVariant(
@@ -932,7 +932,7 @@ class DomainB private constructor() {
         }
     
         class WillBeReplaced(
-            val something: org.partiql.pig.runtime.SymbolPrimitive,
+            val something: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): SumB() {
         
@@ -955,7 +955,7 @@ class DomainB private constructor() {
             }
         
             fun copy(
-                something: org.partiql.pig.runtime.SymbolPrimitive = this.something,
+                something: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.something,
                 metas: MetaContainer = this.metas
             ) =
                 WillBeReplaced(
@@ -1245,44 +1245,37 @@ class DomainB private constructor() {
             walkLongPrimitive(node.bar)
             walkMetas(node.metas)
         }
-    
         open fun walkUnpermutedRecord(node: DomainB.UnpermutedRecord) {
             visitUnpermutedRecord(node)
             walkSymbolPrimitive(node.foo)
             walkLongPrimitive(node.bar)
             walkMetas(node.metas)
         }
-    
         open fun walkProductA(node: DomainB.ProductA) {
             visitProductA(node)
             walkSymbolPrimitive(node.one)
             walkMetas(node.metas)
         }
-    
         open fun walkRecordA(node: DomainB.RecordA) {
             visitRecordA(node)
             walkSymbolPrimitive(node.one)
             walkMetas(node.metas)
         }
-    
         open fun walkSumToReplaceWithProduct(node: DomainB.SumToReplaceWithProduct) {
             visitSumToReplaceWithProduct(node)
             walkSymbolPrimitive(node.foo)
             walkMetas(node.metas)
         }
-    
         open fun walkNewProduct(node: DomainB.NewProduct) {
             visitNewProduct(node)
             walkLongPrimitive(node.foo)
             walkMetas(node.metas)
         }
-    
         open fun walkNewRecord(node: DomainB.NewRecord) {
             visitNewRecord(node)
             walkLongPrimitive(node.foo)
             walkMetas(node.metas)
         }
-    
         //////////////////////////////////////
         // Sum Type: UnpermutedSum
         //////////////////////////////////////
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/EnhancedCalculatorAst.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/EnhancedCalculatorAst.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/EnhancedCalculatorAst.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/EnhancedCalculatorAst.generated.kt
index 9344cb3..6289eb7 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/EnhancedCalculatorAst.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/EnhancedCalculatorAst.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class EnhancedCalculatorAst private constructor() {
@@ -55,7 +55,7 @@ class EnhancedCalculatorAst private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun lit_(
-            value: org.partiql.pig.runtime.LongPrimitive,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): EnhancedCalculatorAst.Expr.Lit =
             EnhancedCalculatorAst.Expr.Lit(
@@ -105,7 +105,7 @@ class EnhancedCalculatorAst private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun let_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             value: Expr,
             body: Expr,
             metas: MetaContainer = emptyMetaContainer()
@@ -138,7 +138,7 @@ class EnhancedCalculatorAst private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variable_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): EnhancedCalculatorAst.Expr.Variable =
             EnhancedCalculatorAst.Expr.Variable(
@@ -230,7 +230,7 @@ class EnhancedCalculatorAst private constructor() {
             }
     
         class Lit(
-            val value: org.partiql.pig.runtime.LongPrimitive,
+            val value: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -253,7 +253,7 @@ class EnhancedCalculatorAst private constructor() {
             }
         
             fun copy(
-                value: org.partiql.pig.runtime.LongPrimitive = this.value,
+                value: org.partiql.pig.legacy.runtime.LongPrimitive = this.value,
                 metas: MetaContainer = this.metas
             ) =
                 Lit(
@@ -344,7 +344,7 @@ class EnhancedCalculatorAst private constructor() {
         }
     
         class Let(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val value: Expr,
             val body: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
@@ -375,7 +375,7 @@ class EnhancedCalculatorAst private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 value: Expr = this.value,
                 body: Expr = this.body,
                 metas: MetaContainer = this.metas
@@ -409,7 +409,7 @@ class EnhancedCalculatorAst private constructor() {
         }
     
         class Variable(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -432,7 +432,7 @@ class EnhancedCalculatorAst private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 metas: MetaContainer = this.metas
             ) =
                 Variable(
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/MultiWordDomain.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/MultiWordDomain.generated.kt
similarity index 92%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/MultiWordDomain.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/MultiWordDomain.generated.kt
index 554f894..5479f13 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/MultiWordDomain.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/MultiWordDomain.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class MultiWordDomain private constructor() {
@@ -66,7 +66,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAab_(
-            dField: org.partiql.pig.runtime.LongPrimitive? = null,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAab =
             MultiWordDomain.AaaAab(
@@ -97,8 +97,8 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAac_(
-            dField: org.partiql.pig.runtime.LongPrimitive? = null,
-            eField: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            eField: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAac =
             MultiWordDomain.AaaAac(
@@ -128,7 +128,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAad_(
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAad =
             MultiWordDomain.AaaAad(
@@ -156,7 +156,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAad_(
-            vararg dField: org.partiql.pig.runtime.LongPrimitive,
+            vararg dField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAad =
             MultiWordDomain.AaaAad(
@@ -185,7 +185,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAae_(
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAae =
             MultiWordDomain.AaaAae(
@@ -215,9 +215,9 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aaaAae_(
-            dField0: org.partiql.pig.runtime.LongPrimitive,
-            dField1: org.partiql.pig.runtime.LongPrimitive,
-            vararg dField: org.partiql.pig.runtime.LongPrimitive,
+            dField0: org.partiql.pig.legacy.runtime.LongPrimitive,
+            dField1: org.partiql.pig.legacy.runtime.LongPrimitive,
+            vararg dField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AaaAae =
             MultiWordDomain.AaaAae(
@@ -248,8 +248,8 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAaa_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAaa =
             MultiWordDomain.AabAaa(
@@ -283,9 +283,9 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAab_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            dField: org.partiql.pig.runtime.LongPrimitive? = null,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAab =
             MultiWordDomain.AabAab(
@@ -322,10 +322,10 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAac_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            dField: org.partiql.pig.runtime.LongPrimitive? = null,
-            eField: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            eField: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAac =
             MultiWordDomain.AabAac(
@@ -361,9 +361,9 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAad_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAad =
             MultiWordDomain.AabAad(
@@ -397,9 +397,9 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAad_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            vararg dField: org.partiql.pig.runtime.LongPrimitive,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            vararg dField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAad =
             MultiWordDomain.AabAad(
@@ -434,9 +434,9 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAae_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAae =
             MultiWordDomain.AabAae(
@@ -472,11 +472,11 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun aabAae_(
-            bField: org.partiql.pig.runtime.LongPrimitive,
-            cField: org.partiql.pig.runtime.SymbolPrimitive,
-            dField0: org.partiql.pig.runtime.LongPrimitive,
-            dField1: org.partiql.pig.runtime.LongPrimitive,
-            vararg dField: org.partiql.pig.runtime.LongPrimitive,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            dField0: org.partiql.pig.legacy.runtime.LongPrimitive,
+            dField1: org.partiql.pig.legacy.runtime.LongPrimitive,
+            vararg dField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.AabAae =
             MultiWordDomain.AabAae(
@@ -509,8 +509,8 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun rrr_(
-            aField: org.partiql.pig.runtime.LongPrimitive,
-            bbbField: org.partiql.pig.runtime.LongPrimitive,
+            aField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            bbbField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.Rrr =
             MultiWordDomain.Rrr(
@@ -541,7 +541,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun lll_(
-            uField: org.partiql.pig.runtime.LongPrimitive,
+            uField: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.SssTtt.Lll =
             MultiWordDomain.SssTtt.Lll(
@@ -570,7 +570,7 @@ class MultiWordDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun mmm_(
-            vField: org.partiql.pig.runtime.SymbolPrimitive,
+            vField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): MultiWordDomain.SssTtt.Mmm =
             MultiWordDomain.SssTtt.Mmm(
@@ -626,7 +626,7 @@ class MultiWordDomain private constructor() {
     }
     
     class AaaAab(
-        val dField: org.partiql.pig.runtime.LongPrimitive?,
+        val dField: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -649,7 +649,7 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            dField: org.partiql.pig.runtime.LongPrimitive? = this.dField,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AaaAab(
@@ -675,8 +675,8 @@ class MultiWordDomain private constructor() {
     }
     
     class AaaAac(
-        val dField: org.partiql.pig.runtime.LongPrimitive?,
-        val eField: org.partiql.pig.runtime.SymbolPrimitive?,
+        val dField: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val eField: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -702,8 +702,8 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            dField: org.partiql.pig.runtime.LongPrimitive? = this.dField,
-            eField: org.partiql.pig.runtime.SymbolPrimitive? = this.eField,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = this.dField,
+            eField: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.eField,
             metas: MetaContainer = this.metas
         ) =
             AaaAac(
@@ -732,7 +732,7 @@ class MultiWordDomain private constructor() {
     }
     
     class AaaAad(
-        val dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -755,7 +755,7 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.dField,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AaaAad(
@@ -781,7 +781,7 @@ class MultiWordDomain private constructor() {
     }
     
     class AaaAae(
-        val dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -804,7 +804,7 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.dField,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AaaAae(
@@ -830,8 +830,8 @@ class MultiWordDomain private constructor() {
     }
     
     class AabAaa(
-        val bField: org.partiql.pig.runtime.LongPrimitive,
-        val cField: org.partiql.pig.runtime.SymbolPrimitive,
+        val bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -857,8 +857,8 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            bField: org.partiql.pig.runtime.LongPrimitive = this.bField,
-            cField: org.partiql.pig.runtime.SymbolPrimitive = this.cField,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bField,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.cField,
             metas: MetaContainer = this.metas
         ) =
             AabAaa(
@@ -887,9 +887,9 @@ class MultiWordDomain private constructor() {
     }
     
     class AabAab(
-        val bField: org.partiql.pig.runtime.LongPrimitive,
-        val cField: org.partiql.pig.runtime.SymbolPrimitive,
-        val dField: org.partiql.pig.runtime.LongPrimitive?,
+        val bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val dField: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -918,9 +918,9 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            bField: org.partiql.pig.runtime.LongPrimitive = this.bField,
-            cField: org.partiql.pig.runtime.SymbolPrimitive = this.cField,
-            dField: org.partiql.pig.runtime.LongPrimitive? = this.dField,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bField,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.cField,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AabAab(
@@ -952,10 +952,10 @@ class MultiWordDomain private constructor() {
     }
     
     class AabAac(
-        val bField: org.partiql.pig.runtime.LongPrimitive,
-        val cField: org.partiql.pig.runtime.SymbolPrimitive,
-        val dField: org.partiql.pig.runtime.LongPrimitive?,
-        val eField: org.partiql.pig.runtime.SymbolPrimitive?,
+        val bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val dField: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val eField: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -987,10 +987,10 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            bField: org.partiql.pig.runtime.LongPrimitive = this.bField,
-            cField: org.partiql.pig.runtime.SymbolPrimitive = this.cField,
-            dField: org.partiql.pig.runtime.LongPrimitive? = this.dField,
-            eField: org.partiql.pig.runtime.SymbolPrimitive? = this.eField,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bField,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.cField,
+            dField: org.partiql.pig.legacy.runtime.LongPrimitive? = this.dField,
+            eField: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.eField,
             metas: MetaContainer = this.metas
         ) =
             AabAac(
@@ -1025,9 +1025,9 @@ class MultiWordDomain private constructor() {
     }
     
     class AabAad(
-        val bField: org.partiql.pig.runtime.LongPrimitive,
-        val cField: org.partiql.pig.runtime.SymbolPrimitive,
-        val dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -1056,9 +1056,9 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            bField: org.partiql.pig.runtime.LongPrimitive = this.bField,
-            cField: org.partiql.pig.runtime.SymbolPrimitive = this.cField,
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.dField,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bField,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.cField,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AabAad(
@@ -1090,9 +1090,9 @@ class MultiWordDomain private constructor() {
     }
     
     class AabAae(
-        val bField: org.partiql.pig.runtime.LongPrimitive,
-        val cField: org.partiql.pig.runtime.SymbolPrimitive,
-        val dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val bField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val cField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -1121,9 +1121,9 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            bField: org.partiql.pig.runtime.LongPrimitive = this.bField,
-            cField: org.partiql.pig.runtime.SymbolPrimitive = this.cField,
-            dField: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.dField,
+            bField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bField,
+            cField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.cField,
+            dField: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.dField,
             metas: MetaContainer = this.metas
         ) =
             AabAae(
@@ -1155,8 +1155,8 @@ class MultiWordDomain private constructor() {
     }
     
     class Rrr(
-        val aField: org.partiql.pig.runtime.LongPrimitive,
-        val bbbField: org.partiql.pig.runtime.LongPrimitive,
+        val aField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val bbbField: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): MultiWordDomainNode() {
     
@@ -1183,8 +1183,8 @@ class MultiWordDomain private constructor() {
         }
     
         fun copy(
-            aField: org.partiql.pig.runtime.LongPrimitive = this.aField,
-            bbbField: org.partiql.pig.runtime.LongPrimitive = this.bbbField,
+            aField: org.partiql.pig.legacy.runtime.LongPrimitive = this.aField,
+            bbbField: org.partiql.pig.legacy.runtime.LongPrimitive = this.bbbField,
             metas: MetaContainer = this.metas
         ) =
             Rrr(
@@ -1225,7 +1225,7 @@ class MultiWordDomain private constructor() {
             }
     
         class Lll(
-            val uField: org.partiql.pig.runtime.LongPrimitive,
+            val uField: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): SssTtt() {
         
@@ -1248,7 +1248,7 @@ class MultiWordDomain private constructor() {
             }
         
             fun copy(
-                uField: org.partiql.pig.runtime.LongPrimitive = this.uField,
+                uField: org.partiql.pig.legacy.runtime.LongPrimitive = this.uField,
                 metas: MetaContainer = this.metas
             ) =
                 Lll(
@@ -1274,7 +1274,7 @@ class MultiWordDomain private constructor() {
         }
     
         class Mmm(
-            val vField: org.partiql.pig.runtime.SymbolPrimitive,
+            val vField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): SssTtt() {
         
@@ -1297,7 +1297,7 @@ class MultiWordDomain private constructor() {
             }
         
             fun copy(
-                vField: org.partiql.pig.runtime.SymbolPrimitive = this.vField,
+                vField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.vField,
                 metas: MetaContainer = this.metas
             ) =
                 Mmm(
@@ -1505,39 +1505,33 @@ class MultiWordDomain private constructor() {
             visitAaaAaa(node)
             walkMetas(node.metas)
         }
-    
         open fun walkAaaAab(node: MultiWordDomain.AaaAab) {
             visitAaaAab(node)
             node.dField?.let { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAaaAac(node: MultiWordDomain.AaaAac) {
             visitAaaAac(node)
             node.dField?.let { walkLongPrimitive(it) }
             node.eField?.let { walkSymbolPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAaaAad(node: MultiWordDomain.AaaAad) {
             visitAaaAad(node)
             node.dField.map { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAaaAae(node: MultiWordDomain.AaaAae) {
             visitAaaAae(node)
             node.dField.map { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAabAaa(node: MultiWordDomain.AabAaa) {
             visitAabAaa(node)
             walkLongPrimitive(node.bField)
             walkSymbolPrimitive(node.cField)
             walkMetas(node.metas)
         }
-    
         open fun walkAabAab(node: MultiWordDomain.AabAab) {
             visitAabAab(node)
             walkLongPrimitive(node.bField)
@@ -1545,7 +1539,6 @@ class MultiWordDomain private constructor() {
             node.dField?.let { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAabAac(node: MultiWordDomain.AabAac) {
             visitAabAac(node)
             walkLongPrimitive(node.bField)
@@ -1554,7 +1547,6 @@ class MultiWordDomain private constructor() {
             node.eField?.let { walkSymbolPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAabAad(node: MultiWordDomain.AabAad) {
             visitAabAad(node)
             walkLongPrimitive(node.bField)
@@ -1562,7 +1554,6 @@ class MultiWordDomain private constructor() {
             node.dField.map { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkAabAae(node: MultiWordDomain.AabAae) {
             visitAabAae(node)
             walkLongPrimitive(node.bField)
@@ -1570,14 +1561,12 @@ class MultiWordDomain private constructor() {
             node.dField.map { walkLongPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkRrr(node: MultiWordDomain.Rrr) {
             visitRrr(node)
             walkLongPrimitive(node.aField)
             walkLongPrimitive(node.bbbField)
             walkMetas(node.metas)
         }
-    
         //////////////////////////////////////
         // Sum Type: SssTtt
         //////////////////////////////////////
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/PartiqlBasic.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/PartiqlBasic.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/PartiqlBasic.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/PartiqlBasic.generated.kt
index 8ff2d35..91ee624 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/PartiqlBasic.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/PartiqlBasic.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class PartiqlBasic private constructor() {
@@ -73,7 +73,7 @@ class PartiqlBasic private constructor() {
          */
         fun groupByItem_(
             value: Expr,
-            asAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.GroupByItem =
             PartiqlBasic.GroupByItem(
@@ -132,7 +132,7 @@ class PartiqlBasic private constructor() {
          */
         fun groupBy_(
             items: GroupByList,
-            groupAsAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            groupAsAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.GroupBy =
             PartiqlBasic.GroupBy(
@@ -217,7 +217,7 @@ class PartiqlBasic private constructor() {
          */
         fun projectExpr_(
             value: Expr,
-            asAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.ProjectItem.ProjectExpr =
             PartiqlBasic.ProjectItem.ProjectExpr(
@@ -300,9 +300,9 @@ class PartiqlBasic private constructor() {
          */
         fun scan_(
             expr: Expr,
-            asAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
-            atAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
-            byAlias: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
+            atAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
+            byAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.FromSource.Scan =
             PartiqlBasic.FromSource.Scan(
@@ -476,7 +476,7 @@ class PartiqlBasic private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun id_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             case: CaseSensitivity,
             scopeQualifier: ScopeQualifier,
             metas: MetaContainer = emptyMetaContainer()
@@ -509,7 +509,7 @@ class PartiqlBasic private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun parameter_(
-            index: org.partiql.pig.runtime.LongPrimitive,
+            index: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.Expr.Parameter =
             PartiqlBasic.Expr.Parameter(
@@ -779,7 +779,7 @@ class PartiqlBasic private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun call_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             args: kotlin.collections.List<Expr>,
             metas: MetaContainer = emptyMetaContainer()
         ): PartiqlBasic.Expr.Call =
@@ -812,7 +812,7 @@ class PartiqlBasic private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun call_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             args0: Expr,
             vararg args: Expr,
             metas: MetaContainer = emptyMetaContainer()
@@ -848,7 +848,7 @@ class PartiqlBasic private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun callAgg_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             setQuantifier: SetQuantifier,
             arg: Expr,
             metas: MetaContainer = emptyMetaContainer()
@@ -1091,7 +1091,7 @@ class PartiqlBasic private constructor() {
     
     class GroupByItem(
         val value: Expr,
-        val asAlias: org.partiql.pig.runtime.SymbolPrimitive?,
+        val asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): PartiqlBasicNode() {
     
@@ -1118,7 +1118,7 @@ class PartiqlBasic private constructor() {
     
         fun copy(
             value: Expr = this.value,
-            asAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.asAlias,
+            asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.asAlias,
             metas: MetaContainer = this.metas
         ) =
             GroupByItem(
@@ -1197,7 +1197,7 @@ class PartiqlBasic private constructor() {
     
     class GroupBy(
         val items: GroupByList,
-        val groupAsAlias: org.partiql.pig.runtime.SymbolPrimitive?,
+        val groupAsAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): PartiqlBasicNode() {
     
@@ -1224,7 +1224,7 @@ class PartiqlBasic private constructor() {
     
         fun copy(
             items: GroupByList = this.items,
-            groupAsAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.groupAsAlias,
+            groupAsAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.groupAsAlias,
             metas: MetaContainer = this.metas
         ) =
             GroupBy(
@@ -1414,7 +1414,7 @@ class PartiqlBasic private constructor() {
     
         class ProjectExpr(
             val value: Expr,
-            val asAlias: org.partiql.pig.runtime.SymbolPrimitive?,
+            val asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
             override val metas: MetaContainer = emptyMetaContainer()
         ): ProjectItem() {
         
@@ -1441,7 +1441,7 @@ class PartiqlBasic private constructor() {
         
             fun copy(
                 value: Expr = this.value,
-                asAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.asAlias,
+                asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.asAlias,
                 metas: MetaContainer = this.metas
             ) =
                 ProjectExpr(
@@ -1639,9 +1639,9 @@ class PartiqlBasic private constructor() {
     
         class Scan(
             val expr: Expr,
-            val asAlias: org.partiql.pig.runtime.SymbolPrimitive?,
-            val atAlias: org.partiql.pig.runtime.SymbolPrimitive?,
-            val byAlias: org.partiql.pig.runtime.SymbolPrimitive?,
+            val asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
+            val atAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
+            val byAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
             override val metas: MetaContainer = emptyMetaContainer()
         ): FromSource() {
         
@@ -1674,9 +1674,9 @@ class PartiqlBasic private constructor() {
         
             fun copy(
                 expr: Expr = this.expr,
-                asAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.asAlias,
-                atAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.atAlias,
-                byAlias: org.partiql.pig.runtime.SymbolPrimitive? = this.byAlias,
+                asAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.asAlias,
+                atAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.atAlias,
+                byAlias: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.byAlias,
                 metas: MetaContainer = this.metas
             ) =
                 Scan(
@@ -2247,7 +2247,7 @@ class PartiqlBasic private constructor() {
         }
     
         class Id(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val case: CaseSensitivity,
             val scopeQualifier: ScopeQualifier,
             override val metas: MetaContainer = emptyMetaContainer()
@@ -2278,7 +2278,7 @@ class PartiqlBasic private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 case: CaseSensitivity = this.case,
                 scopeQualifier: ScopeQualifier = this.scopeQualifier,
                 metas: MetaContainer = this.metas
@@ -2312,7 +2312,7 @@ class PartiqlBasic private constructor() {
         }
     
         class Parameter(
-            val index: org.partiql.pig.runtime.LongPrimitive,
+            val index: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -2335,7 +2335,7 @@ class PartiqlBasic private constructor() {
             }
         
             fun copy(
-                index: org.partiql.pig.runtime.LongPrimitive = this.index,
+                index: org.partiql.pig.legacy.runtime.LongPrimitive = this.index,
                 metas: MetaContainer = this.metas
             ) =
                 Parameter(
@@ -2891,7 +2891,7 @@ class PartiqlBasic private constructor() {
         }
     
         class Call(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val args: kotlin.collections.List<Expr>,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
@@ -2918,7 +2918,7 @@ class PartiqlBasic private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 args: kotlin.collections.List<Expr> = this.args,
                 metas: MetaContainer = this.metas
             ) =
@@ -2948,7 +2948,7 @@ class PartiqlBasic private constructor() {
         }
     
         class CallAgg(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val setQuantifier: SetQuantifier,
             val arg: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
@@ -2979,7 +2979,7 @@ class PartiqlBasic private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 setQuantifier: SetQuantifier = this.setQuantifier,
                 arg: Expr = this.arg,
                 metas: MetaContainer = this.metas
@@ -3891,27 +3891,23 @@ class PartiqlBasic private constructor() {
             walkExpr(node.second)
             walkMetas(node.metas)
         }
-    
         open fun walkGroupByItem(node: PartiqlBasic.GroupByItem) {
             visitGroupByItem(node)
             walkExpr(node.value)
             node.asAlias?.let { walkSymbolPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkGroupByList(node: PartiqlBasic.GroupByList) {
             visitGroupByList(node)
             node.items.map { walkGroupByItem(it) }
             walkMetas(node.metas)
         }
-    
         open fun walkGroupBy(node: PartiqlBasic.GroupBy) {
             visitGroupBy(node)
             walkGroupByList(node.items)
             node.groupAsAlias?.let { walkSymbolPrimitive(it) }
             walkMetas(node.metas)
         }
-    
         //////////////////////////////////////
         // Sum Type: Projection
         //////////////////////////////////////
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/TestDomain.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/TestDomain.generated.kt
similarity index 95%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/TestDomain.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/TestDomain.generated.kt
index 9da8506..cafafa5 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/TestDomain.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/TestDomain.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class TestDomain private constructor() {
@@ -57,8 +57,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun boolPair_(
-            first: org.partiql.pig.runtime.BoolPrimitive,
-            second: org.partiql.pig.runtime.BoolPrimitive,
+            first: org.partiql.pig.legacy.runtime.BoolPrimitive,
+            second: org.partiql.pig.legacy.runtime.BoolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.BoolPair =
             TestDomain.BoolPair(
@@ -90,8 +90,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun intPair_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.IntPair =
             TestDomain.IntPair(
@@ -123,8 +123,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun symbolPair_(
-            first: org.partiql.pig.runtime.SymbolPrimitive,
-            second: org.partiql.pig.runtime.SymbolPrimitive,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.SymbolPair =
             TestDomain.SymbolPair(
@@ -171,8 +171,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun intSymbolPair_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.SymbolPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.IntSymbolPair =
             TestDomain.IntSymbolPair(
@@ -204,8 +204,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun symbolIntPair_(
-            first: org.partiql.pig.runtime.SymbolPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.SymbolIntPair =
             TestDomain.SymbolIntPair(
@@ -238,7 +238,7 @@ class TestDomain private constructor() {
          */
         fun ionIntPair_(
             first: com.amazon.ionelement.api.IonElement,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.IonIntPair =
             TestDomain.IonIntPair(
@@ -330,7 +330,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun recursivePair_(
-            first: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
             second: RecursivePair? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RecursivePair =
@@ -379,7 +379,7 @@ class TestDomain private constructor() {
          */
         fun answerIntPair_(
             first: Answer,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.AnswerIntPair =
             TestDomain.AnswerIntPair(
@@ -411,7 +411,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun intAnswerPair_(
-            first: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
             second: Answer,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.IntAnswerPair =
@@ -444,7 +444,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun symbolAnswerPair_(
-            first: org.partiql.pig.runtime.SymbolPrimitive,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             second: Answer,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.SymbolAnswerPair =
@@ -478,7 +478,7 @@ class TestDomain private constructor() {
          */
         fun answerSymbolPair_(
             first: Answer,
-            second: org.partiql.pig.runtime.SymbolPrimitive,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.AnswerSymbolPair =
             TestDomain.AnswerSymbolPair(
@@ -508,7 +508,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optional1_(
-            value: org.partiql.pig.runtime.LongPrimitive? = null,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.Optional1 =
             TestDomain.Optional1(
@@ -539,8 +539,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optional2_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            second: org.partiql.pig.runtime.LongPrimitive? = null,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.Optional2 =
             TestDomain.Optional2(
@@ -572,8 +572,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun requiredOptional_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive? = null,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RequiredOptional =
             TestDomain.RequiredOptional(
@@ -605,8 +605,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optionalRequired_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.OptionalRequired =
             TestDomain.OptionalRequired(
@@ -636,7 +636,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variadicMin0_(
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.VariadicMin0 =
             TestDomain.VariadicMin0(
@@ -664,7 +664,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variadicMin0_(
-            vararg ints: org.partiql.pig.runtime.LongPrimitive,
+            vararg ints: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.VariadicMin0 =
             TestDomain.VariadicMin0(
@@ -693,7 +693,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variadicMin1_(
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.VariadicMin1 =
             TestDomain.VariadicMin1(
@@ -722,8 +722,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variadicMin1_(
-            ints0: org.partiql.pig.runtime.LongPrimitive,
-            vararg ints: org.partiql.pig.runtime.LongPrimitive,
+            ints0: org.partiql.pig.legacy.runtime.LongPrimitive,
+            vararg ints: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.VariadicMin1 =
             TestDomain.VariadicMin1(
@@ -754,8 +754,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun elementVariadic_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.ElementVariadic =
             TestDomain.ElementVariadic(
@@ -786,8 +786,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun elementVariadic_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
-            vararg ints: org.partiql.pig.runtime.LongPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            vararg ints: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.ElementVariadic =
             TestDomain.ElementVariadic(
@@ -819,8 +819,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun requiredVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RequiredVariadic =
             TestDomain.RequiredVariadic(
@@ -851,8 +851,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun requiredVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            vararg second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            vararg second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RequiredVariadic =
             TestDomain.RequiredVariadic(
@@ -884,8 +884,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optionalVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.OptionalVariadic =
             TestDomain.OptionalVariadic(
@@ -916,8 +916,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optionalVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            vararg second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            vararg second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.OptionalVariadic =
             TestDomain.OptionalVariadic(
@@ -951,9 +951,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun requiredOptionalVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive? = null,
-            third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RequiredOptionalVariadic =
             TestDomain.RequiredOptionalVariadic(
@@ -987,9 +987,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun requiredOptionalVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive? = null,
-            vararg third: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            vararg third: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.RequiredOptionalVariadic =
             TestDomain.RequiredOptionalVariadic(
@@ -1024,9 +1024,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optionalRequiredVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            second: org.partiql.pig.runtime.LongPrimitive,
-            third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = emptyList(),
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
+            third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = emptyList(),
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.OptionalRequiredVariadic =
             TestDomain.OptionalRequiredVariadic(
@@ -1060,9 +1060,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun optionalRequiredVariadic_(
-            first: org.partiql.pig.runtime.LongPrimitive? = null,
-            second: org.partiql.pig.runtime.LongPrimitive,
-            vararg third: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
+            vararg third: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.OptionalRequiredVariadic =
             TestDomain.OptionalRequiredVariadic(
@@ -1097,8 +1097,8 @@ class TestDomain private constructor() {
          */
         @Experimental
         fun experimentalProduct_(
-            first: org.partiql.pig.runtime.BoolPrimitive,
-            second: org.partiql.pig.runtime.BoolPrimitive,
+            first: org.partiql.pig.legacy.runtime.BoolPrimitive,
+            second: org.partiql.pig.legacy.runtime.BoolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.ExperimentalProduct =
             TestDomain.ExperimentalProduct(
@@ -1132,8 +1132,8 @@ class TestDomain private constructor() {
          */
         @Deprecated("This node is marked as deprecated")
         fun deprecatedProduct_(
-            first: org.partiql.pig.runtime.LongPrimitive,
-            second: org.partiql.pig.runtime.LongPrimitive,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.DeprecatedProduct =
             TestDomain.DeprecatedProduct(
@@ -1167,9 +1167,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun domainLevelRecord_(
-            someField: org.partiql.pig.runtime.LongPrimitive,
-            anotherField: org.partiql.pig.runtime.SymbolPrimitive,
-            optionalField: org.partiql.pig.runtime.LongPrimitive? = null,
+            someField: org.partiql.pig.legacy.runtime.LongPrimitive,
+            anotherField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            optionalField: org.partiql.pig.legacy.runtime.LongPrimitive? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.DomainLevelRecord =
             TestDomain.DomainLevelRecord(
@@ -1202,7 +1202,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun productWithRecord_(
-            value: org.partiql.pig.runtime.LongPrimitive,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive,
             dlr: DomainLevelRecord,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.ProductWithRecord =
@@ -1291,7 +1291,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variantWithRecord_(
-            value: org.partiql.pig.runtime.LongPrimitive,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive,
             dlr: DomainLevelRecord,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.SumWithRecord.VariantWithRecord =
@@ -1323,7 +1323,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun one_(
-            a: org.partiql.pig.runtime.LongPrimitive,
+            a: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.TestSum.One =
             TestDomain.TestSum.One(
@@ -1354,8 +1354,8 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun two_(
-            a: org.partiql.pig.runtime.LongPrimitive,
-            b: org.partiql.pig.runtime.LongPrimitive,
+            a: org.partiql.pig.legacy.runtime.LongPrimitive,
+            b: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.TestSum.Two =
             TestDomain.TestSum.Two(
@@ -1389,9 +1389,9 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun three_(
-            a: org.partiql.pig.runtime.LongPrimitive,
-            b: org.partiql.pig.runtime.LongPrimitive,
-            c: org.partiql.pig.runtime.LongPrimitive,
+            a: org.partiql.pig.legacy.runtime.LongPrimitive,
+            b: org.partiql.pig.legacy.runtime.LongPrimitive,
+            c: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.TestSum.Three =
             TestDomain.TestSum.Three(
@@ -1538,7 +1538,7 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun android_(
-            id: org.partiql.pig.runtime.LongPrimitive,
+            id: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.Entity.Android =
             TestDomain.Entity.Android(
@@ -1575,10 +1575,10 @@ class TestDomain private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun human_(
-            firstName: org.partiql.pig.runtime.SymbolPrimitive,
-            middleNames: kotlin.collections.List<org.partiql.pig.runtime.SymbolPrimitive> = emptyList(),
-            lastName: org.partiql.pig.runtime.SymbolPrimitive,
-            title: org.partiql.pig.runtime.SymbolPrimitive? = null,
+            firstName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            middleNames: kotlin.collections.List<org.partiql.pig.legacy.runtime.SymbolPrimitive> = emptyList(),
+            lastName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            title: org.partiql.pig.legacy.runtime.SymbolPrimitive? = null,
             parent: Entity? = null,
             metas: MetaContainer = emptyMetaContainer()
         ): TestDomain.Entity.Human =
@@ -1608,8 +1608,8 @@ class TestDomain private constructor() {
     // Tuple Types
     /////////////////////////////////////////////////////////////////////////////
     class BoolPair(
-        val first: org.partiql.pig.runtime.BoolPrimitive,
-        val second: org.partiql.pig.runtime.BoolPrimitive,
+        val first: org.partiql.pig.legacy.runtime.BoolPrimitive,
+        val second: org.partiql.pig.legacy.runtime.BoolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1635,8 +1635,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.BoolPrimitive = this.first,
-            second: org.partiql.pig.runtime.BoolPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.BoolPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.BoolPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             BoolPair(
@@ -1665,8 +1665,8 @@ class TestDomain private constructor() {
     }
     
     class IntPair(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1692,8 +1692,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             IntPair(
@@ -1722,8 +1722,8 @@ class TestDomain private constructor() {
     }
     
     class SymbolPair(
-        val first: org.partiql.pig.runtime.SymbolPrimitive,
-        val second: org.partiql.pig.runtime.SymbolPrimitive,
+        val first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1749,8 +1749,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.SymbolPrimitive = this.first,
-            second: org.partiql.pig.runtime.SymbolPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             SymbolPair(
@@ -1836,8 +1836,8 @@ class TestDomain private constructor() {
     }
     
     class IntSymbolPair(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: org.partiql.pig.runtime.SymbolPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1863,8 +1863,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: org.partiql.pig.runtime.SymbolPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             IntSymbolPair(
@@ -1893,8 +1893,8 @@ class TestDomain private constructor() {
     }
     
     class SymbolIntPair(
-        val first: org.partiql.pig.runtime.SymbolPrimitive,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1920,8 +1920,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.SymbolPrimitive = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             SymbolIntPair(
@@ -1951,7 +1951,7 @@ class TestDomain private constructor() {
     
     class IonIntPair(
         val first: com.amazon.ionelement.api.AnyElement,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -1978,7 +1978,7 @@ class TestDomain private constructor() {
     
         fun copy(
             first: com.amazon.ionelement.api.AnyElement = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             IonIntPair(
@@ -2235,7 +2235,7 @@ class TestDomain private constructor() {
     }
     
     class RecursivePair(
-        val first: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
         val second: RecursivePair?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
@@ -2262,7 +2262,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
             second: RecursivePair? = this.second,
             metas: MetaContainer = this.metas
         ) =
@@ -2350,7 +2350,7 @@ class TestDomain private constructor() {
     
     class AnswerIntPair(
         val first: Answer,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2377,7 +2377,7 @@ class TestDomain private constructor() {
     
         fun copy(
             first: Answer = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             AnswerIntPair(
@@ -2406,7 +2406,7 @@ class TestDomain private constructor() {
     }
     
     class IntAnswerPair(
-        val first: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
         val second: Answer,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
@@ -2433,7 +2433,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
             second: Answer = this.second,
             metas: MetaContainer = this.metas
         ) =
@@ -2463,7 +2463,7 @@ class TestDomain private constructor() {
     }
     
     class SymbolAnswerPair(
-        val first: org.partiql.pig.runtime.SymbolPrimitive,
+        val first: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         val second: Answer,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
@@ -2490,7 +2490,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.SymbolPrimitive = this.first,
+            first: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.first,
             second: Answer = this.second,
             metas: MetaContainer = this.metas
         ) =
@@ -2521,7 +2521,7 @@ class TestDomain private constructor() {
     
     class AnswerSymbolPair(
         val first: Answer,
-        val second: org.partiql.pig.runtime.SymbolPrimitive,
+        val second: org.partiql.pig.legacy.runtime.SymbolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2548,7 +2548,7 @@ class TestDomain private constructor() {
     
         fun copy(
             first: Answer = this.first,
-            second: org.partiql.pig.runtime.SymbolPrimitive = this.second,
+            second: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             AnswerSymbolPair(
@@ -2577,7 +2577,7 @@ class TestDomain private constructor() {
     }
     
     class Optional1(
-        val value: org.partiql.pig.runtime.LongPrimitive?,
+        val value: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2600,7 +2600,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            value: org.partiql.pig.runtime.LongPrimitive? = this.value,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive? = this.value,
             metas: MetaContainer = this.metas
         ) =
             Optional1(
@@ -2626,8 +2626,8 @@ class TestDomain private constructor() {
     }
     
     class Optional2(
-        val first: org.partiql.pig.runtime.LongPrimitive?,
-        val second: org.partiql.pig.runtime.LongPrimitive?,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2653,8 +2653,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive? = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive? = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = this.second,
             metas: MetaContainer = this.metas
         ) =
             Optional2(
@@ -2683,8 +2683,8 @@ class TestDomain private constructor() {
     }
     
     class RequiredOptional(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: org.partiql.pig.runtime.LongPrimitive?,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2710,8 +2710,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive? = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = this.second,
             metas: MetaContainer = this.metas
         ) =
             RequiredOptional(
@@ -2740,8 +2740,8 @@ class TestDomain private constructor() {
     }
     
     class OptionalRequired(
-        val first: org.partiql.pig.runtime.LongPrimitive?,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2767,8 +2767,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive? = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             OptionalRequired(
@@ -2797,7 +2797,7 @@ class TestDomain private constructor() {
     }
     
     class VariadicMin0(
-        val ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2820,7 +2820,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.ints,
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.ints,
             metas: MetaContainer = this.metas
         ) =
             VariadicMin0(
@@ -2846,7 +2846,7 @@ class TestDomain private constructor() {
     }
     
     class VariadicMin1(
-        val ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2869,7 +2869,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.ints,
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.ints,
             metas: MetaContainer = this.metas
         ) =
             VariadicMin1(
@@ -2895,8 +2895,8 @@ class TestDomain private constructor() {
     }
     
     class ElementVariadic(
-        val name: org.partiql.pig.runtime.SymbolPrimitive,
-        val ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2922,8 +2922,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
-            ints: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.ints,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
+            ints: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.ints,
             metas: MetaContainer = this.metas
         ) =
             ElementVariadic(
@@ -2952,8 +2952,8 @@ class TestDomain private constructor() {
     }
     
     class RequiredVariadic(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -2979,8 +2979,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.second,
             metas: MetaContainer = this.metas
         ) =
             RequiredVariadic(
@@ -3009,8 +3009,8 @@ class TestDomain private constructor() {
     }
     
     class OptionalVariadic(
-        val first: org.partiql.pig.runtime.LongPrimitive?,
-        val second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3036,8 +3036,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive? = this.first,
-            second: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = this.first,
+            second: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.second,
             metas: MetaContainer = this.metas
         ) =
             OptionalVariadic(
@@ -3066,9 +3066,9 @@ class TestDomain private constructor() {
     }
     
     class RequiredOptionalVariadic(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: org.partiql.pig.runtime.LongPrimitive?,
-        val third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3097,9 +3097,9 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive? = this.second,
-            third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.third,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive? = this.second,
+            third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.third,
             metas: MetaContainer = this.metas
         ) =
             RequiredOptionalVariadic(
@@ -3131,9 +3131,9 @@ class TestDomain private constructor() {
     }
     
     class OptionalRequiredVariadic(
-        val first: org.partiql.pig.runtime.LongPrimitive?,
-        val second: org.partiql.pig.runtime.LongPrimitive,
-        val third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive>,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive?,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive>,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3162,9 +3162,9 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive? = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
-            third: kotlin.collections.List<org.partiql.pig.runtime.LongPrimitive> = this.third,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive? = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
+            third: kotlin.collections.List<org.partiql.pig.legacy.runtime.LongPrimitive> = this.third,
             metas: MetaContainer = this.metas
         ) =
             OptionalRequiredVariadic(
@@ -3197,8 +3197,8 @@ class TestDomain private constructor() {
     
     @Experimental
     class ExperimentalProduct(
-        val first: org.partiql.pig.runtime.BoolPrimitive,
-        val second: org.partiql.pig.runtime.BoolPrimitive,
+        val first: org.partiql.pig.legacy.runtime.BoolPrimitive,
+        val second: org.partiql.pig.legacy.runtime.BoolPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3224,8 +3224,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.BoolPrimitive = this.first,
-            second: org.partiql.pig.runtime.BoolPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.BoolPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.BoolPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             ExperimentalProduct(
@@ -3255,8 +3255,8 @@ class TestDomain private constructor() {
     
     @Deprecated("This node is marked as deprecated")
     class DeprecatedProduct(
-        val first: org.partiql.pig.runtime.LongPrimitive,
-        val second: org.partiql.pig.runtime.LongPrimitive,
+        val first: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val second: org.partiql.pig.legacy.runtime.LongPrimitive,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3282,8 +3282,8 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            first: org.partiql.pig.runtime.LongPrimitive = this.first,
-            second: org.partiql.pig.runtime.LongPrimitive = this.second,
+            first: org.partiql.pig.legacy.runtime.LongPrimitive = this.first,
+            second: org.partiql.pig.legacy.runtime.LongPrimitive = this.second,
             metas: MetaContainer = this.metas
         ) =
             DeprecatedProduct(
@@ -3312,9 +3312,9 @@ class TestDomain private constructor() {
     }
     
     class DomainLevelRecord(
-        val someField: org.partiql.pig.runtime.LongPrimitive,
-        val anotherField: org.partiql.pig.runtime.SymbolPrimitive,
-        val optionalField: org.partiql.pig.runtime.LongPrimitive?,
+        val someField: org.partiql.pig.legacy.runtime.LongPrimitive,
+        val anotherField: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+        val optionalField: org.partiql.pig.legacy.runtime.LongPrimitive?,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
     
@@ -3344,9 +3344,9 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            someField: org.partiql.pig.runtime.LongPrimitive = this.someField,
-            anotherField: org.partiql.pig.runtime.SymbolPrimitive = this.anotherField,
-            optionalField: org.partiql.pig.runtime.LongPrimitive? = this.optionalField,
+            someField: org.partiql.pig.legacy.runtime.LongPrimitive = this.someField,
+            anotherField: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.anotherField,
+            optionalField: org.partiql.pig.legacy.runtime.LongPrimitive? = this.optionalField,
             metas: MetaContainer = this.metas
         ) =
             DomainLevelRecord(
@@ -3378,7 +3378,7 @@ class TestDomain private constructor() {
     }
     
     class ProductWithRecord(
-        val value: org.partiql.pig.runtime.LongPrimitive,
+        val value: org.partiql.pig.legacy.runtime.LongPrimitive,
         val dlr: DomainLevelRecord,
         override val metas: MetaContainer = emptyMetaContainer()
     ): TestDomainNode() {
@@ -3405,7 +3405,7 @@ class TestDomain private constructor() {
         }
     
         fun copy(
-            value: org.partiql.pig.runtime.LongPrimitive = this.value,
+            value: org.partiql.pig.legacy.runtime.LongPrimitive = this.value,
             dlr: DomainLevelRecord = this.dlr,
             metas: MetaContainer = this.metas
         ) =
@@ -3649,7 +3649,7 @@ class TestDomain private constructor() {
             }
     
         class VariantWithRecord(
-            val value: org.partiql.pig.runtime.LongPrimitive,
+            val value: org.partiql.pig.legacy.runtime.LongPrimitive,
             val dlr: DomainLevelRecord,
             override val metas: MetaContainer = emptyMetaContainer()
         ): SumWithRecord() {
@@ -3676,7 +3676,7 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                value: org.partiql.pig.runtime.LongPrimitive = this.value,
+                value: org.partiql.pig.legacy.runtime.LongPrimitive = this.value,
                 dlr: DomainLevelRecord = this.dlr,
                 metas: MetaContainer = this.metas
             ) =
@@ -3724,7 +3724,7 @@ class TestDomain private constructor() {
             }
     
         class One(
-            val a: org.partiql.pig.runtime.LongPrimitive,
+            val a: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): TestSum() {
         
@@ -3747,7 +3747,7 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                a: org.partiql.pig.runtime.LongPrimitive = this.a,
+                a: org.partiql.pig.legacy.runtime.LongPrimitive = this.a,
                 metas: MetaContainer = this.metas
             ) =
                 One(
@@ -3773,8 +3773,8 @@ class TestDomain private constructor() {
         }
     
         class Two(
-            val a: org.partiql.pig.runtime.LongPrimitive,
-            val b: org.partiql.pig.runtime.LongPrimitive,
+            val a: org.partiql.pig.legacy.runtime.LongPrimitive,
+            val b: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): TestSum() {
         
@@ -3800,8 +3800,8 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                a: org.partiql.pig.runtime.LongPrimitive = this.a,
-                b: org.partiql.pig.runtime.LongPrimitive = this.b,
+                a: org.partiql.pig.legacy.runtime.LongPrimitive = this.a,
+                b: org.partiql.pig.legacy.runtime.LongPrimitive = this.b,
                 metas: MetaContainer = this.metas
             ) =
                 Two(
@@ -3830,9 +3830,9 @@ class TestDomain private constructor() {
         }
     
         class Three(
-            val a: org.partiql.pig.runtime.LongPrimitive,
-            val b: org.partiql.pig.runtime.LongPrimitive,
-            val c: org.partiql.pig.runtime.LongPrimitive,
+            val a: org.partiql.pig.legacy.runtime.LongPrimitive,
+            val b: org.partiql.pig.legacy.runtime.LongPrimitive,
+            val c: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): TestSum() {
         
@@ -3861,9 +3861,9 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                a: org.partiql.pig.runtime.LongPrimitive = this.a,
-                b: org.partiql.pig.runtime.LongPrimitive = this.b,
-                c: org.partiql.pig.runtime.LongPrimitive = this.c,
+                a: org.partiql.pig.legacy.runtime.LongPrimitive = this.a,
+                b: org.partiql.pig.legacy.runtime.LongPrimitive = this.b,
+                c: org.partiql.pig.legacy.runtime.LongPrimitive = this.c,
                 metas: MetaContainer = this.metas
             ) =
                 Three(
@@ -4297,7 +4297,7 @@ class TestDomain private constructor() {
         }
     
         class Android(
-            val id: org.partiql.pig.runtime.LongPrimitive,
+            val id: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Entity() {
         
@@ -4320,7 +4320,7 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                id: org.partiql.pig.runtime.LongPrimitive = this.id,
+                id: org.partiql.pig.legacy.runtime.LongPrimitive = this.id,
                 metas: MetaContainer = this.metas
             ) =
                 Android(
@@ -4346,10 +4346,10 @@ class TestDomain private constructor() {
         }
     
         class Human(
-            val firstName: org.partiql.pig.runtime.SymbolPrimitive,
-            val middleNames: kotlin.collections.List<org.partiql.pig.runtime.SymbolPrimitive>,
-            val lastName: org.partiql.pig.runtime.SymbolPrimitive,
-            val title: org.partiql.pig.runtime.SymbolPrimitive?,
+            val firstName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val middleNames: kotlin.collections.List<org.partiql.pig.legacy.runtime.SymbolPrimitive>,
+            val lastName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val title: org.partiql.pig.legacy.runtime.SymbolPrimitive?,
             val parent: Entity?,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Entity() {
@@ -4386,10 +4386,10 @@ class TestDomain private constructor() {
             }
         
             fun copy(
-                firstName: org.partiql.pig.runtime.SymbolPrimitive = this.firstName,
-                middleNames: kotlin.collections.List<org.partiql.pig.runtime.SymbolPrimitive> = this.middleNames,
-                lastName: org.partiql.pig.runtime.SymbolPrimitive = this.lastName,
-                title: org.partiql.pig.runtime.SymbolPrimitive? = this.title,
+                firstName: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.firstName,
+                middleNames: kotlin.collections.List<org.partiql.pig.legacy.runtime.SymbolPrimitive> = this.middleNames,
+                lastName: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.lastName,
+                title: org.partiql.pig.legacy.runtime.SymbolPrimitive? = this.title,
                 parent: Entity? = this.parent,
                 metas: MetaContainer = this.metas
             ) =
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLang.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLang.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLang.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLang.generated.kt
index 14457b7..57f9491 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLang.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLang.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class ToyLang private constructor() {
@@ -124,7 +124,7 @@ class ToyLang private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variable_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): ToyLang.Expr.Variable =
             ToyLang.Expr.Variable(
@@ -199,7 +199,7 @@ class ToyLang private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun let_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             value: Expr,
             body: Expr,
             metas: MetaContainer = emptyMetaContainer()
@@ -234,7 +234,7 @@ class ToyLang private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun function_(
-            varName: org.partiql.pig.runtime.SymbolPrimitive,
+            varName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             body: Expr,
             metas: MetaContainer = emptyMetaContainer()
         ): ToyLang.Expr.Function =
@@ -506,7 +506,7 @@ class ToyLang private constructor() {
         }
     
         class Variable(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -529,7 +529,7 @@ class ToyLang private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 metas: MetaContainer = this.metas
             ) =
                 Variable(
@@ -661,7 +661,7 @@ class ToyLang private constructor() {
         }
     
         class Let(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val value: Expr,
             val body: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
@@ -692,7 +692,7 @@ class ToyLang private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
                 value: Expr = this.value,
                 body: Expr = this.body,
                 metas: MetaContainer = this.metas
@@ -726,7 +726,7 @@ class ToyLang private constructor() {
         }
     
         class Function(
-            val varName: org.partiql.pig.runtime.SymbolPrimitive,
+            val varName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val body: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
@@ -753,7 +753,7 @@ class ToyLang private constructor() {
             }
         
             fun copy(
-                varName: org.partiql.pig.runtime.SymbolPrimitive = this.varName,
+                varName: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.varName,
                 body: Expr = this.body,
                 metas: MetaContainer = this.metas
             ) =
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexed.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexed.generated.kt
similarity index 97%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexed.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexed.generated.kt
index 00cae6e..0918187 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexed.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexed.generated.kt
@@ -7,10 +7,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 class ToyLangIndexed private constructor() {
@@ -168,7 +168,7 @@ class ToyLangIndexed private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun function_(
-            varName: org.partiql.pig.runtime.SymbolPrimitive,
+            varName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             body: Expr,
             metas: MetaContainer = emptyMetaContainer()
         ): ToyLangIndexed.Expr.Function =
@@ -201,8 +201,8 @@ class ToyLangIndexed private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun variable_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
-            index: org.partiql.pig.runtime.LongPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            index: org.partiql.pig.legacy.runtime.LongPrimitive,
             metas: MetaContainer = emptyMetaContainer()
         ): ToyLangIndexed.Expr.Variable =
             ToyLangIndexed.Expr.Variable(
@@ -238,8 +238,8 @@ class ToyLangIndexed private constructor() {
          * (The "_" suffix is needed to work-around conflicts due to type erasure and ambiguities with null arguments.)
          */
         fun let_(
-            name: org.partiql.pig.runtime.SymbolPrimitive,
-            index: org.partiql.pig.runtime.LongPrimitive,
+            name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            index: org.partiql.pig.legacy.runtime.LongPrimitive,
             value: Expr,
             body: Expr,
             metas: MetaContainer = emptyMetaContainer()
@@ -620,7 +620,7 @@ class ToyLangIndexed private constructor() {
         }
     
         class Function(
-            val varName: org.partiql.pig.runtime.SymbolPrimitive,
+            val varName: org.partiql.pig.legacy.runtime.SymbolPrimitive,
             val body: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
@@ -647,7 +647,7 @@ class ToyLangIndexed private constructor() {
             }
         
             fun copy(
-                varName: org.partiql.pig.runtime.SymbolPrimitive = this.varName,
+                varName: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.varName,
                 body: Expr = this.body,
                 metas: MetaContainer = this.metas
             ) =
@@ -677,8 +677,8 @@ class ToyLangIndexed private constructor() {
         }
     
         class Variable(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
-            val index: org.partiql.pig.runtime.LongPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val index: org.partiql.pig.legacy.runtime.LongPrimitive,
             override val metas: MetaContainer = emptyMetaContainer()
         ): Expr() {
         
@@ -704,8 +704,8 @@ class ToyLangIndexed private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
-                index: org.partiql.pig.runtime.LongPrimitive = this.index,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
+                index: org.partiql.pig.legacy.runtime.LongPrimitive = this.index,
                 metas: MetaContainer = this.metas
             ) =
                 Variable(
@@ -734,8 +734,8 @@ class ToyLangIndexed private constructor() {
         }
     
         class Let(
-            val name: org.partiql.pig.runtime.SymbolPrimitive,
-            val index: org.partiql.pig.runtime.LongPrimitive,
+            val name: org.partiql.pig.legacy.runtime.SymbolPrimitive,
+            val index: org.partiql.pig.legacy.runtime.LongPrimitive,
             val value: Expr,
             val body: Expr,
             override val metas: MetaContainer = emptyMetaContainer()
@@ -769,8 +769,8 @@ class ToyLangIndexed private constructor() {
             }
         
             fun copy(
-                name: org.partiql.pig.runtime.SymbolPrimitive = this.name,
-                index: org.partiql.pig.runtime.LongPrimitive = this.index,
+                name: org.partiql.pig.legacy.runtime.SymbolPrimitive = this.name,
+                index: org.partiql.pig.legacy.runtime.LongPrimitive = this.index,
                 value: Expr = this.value,
                 body: Expr = this.body,
                 metas: MetaContainer = this.metas
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexedToToyLang.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexedToToyLang.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexedToToyLang.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexedToToyLang.generated.kt
index 32a414a..4146755 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangIndexedToToyLang.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangIndexedToToyLang.generated.kt
@@ -8,10 +8,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 abstract class ToyLangIndexedToToyLangVisitorTransform : DomainVisitorTransformBase() {
diff --git a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangToToyLangIndexed.generated.kt b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangToToyLangIndexed.generated.kt
similarity index 98%
rename from pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangToToyLangIndexed.generated.kt
rename to pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangToToyLangIndexed.generated.kt
index 806cb99..f072bc8 100644
--- a/pig-tests/src/main/kotlin/org/partiql/pig/tests/generated/ToyLangToToyLangIndexed.generated.kt
+++ b/pig-tests/src/main/kotlin/org/partiql/pig/legacy/tests/generated/ToyLangToToyLangIndexed.generated.kt
@@ -8,10 +8,10 @@
 "CanBePrimaryConstructorProperty", "UNNECESSARY_SAFE_CALL",
 "USELESS_ELVIS", "RemoveRedundantQualifierName", "LocalVariableName")
 
-package org.partiql.pig.tests.generated
+package org.partiql.pig.legacy.tests.generated
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
 
 abstract class ToyLangToToyLangIndexedVisitorTransform : DomainVisitorTransformBase() {
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/ArgumentsProviderBase.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/ArgumentsProviderBase.kt
similarity index 97%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/ArgumentsProviderBase.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/ArgumentsProviderBase.kt
index bf2a93e..32989c3 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/ArgumentsProviderBase.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/ArgumentsProviderBase.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.params.provider.Arguments
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/CopyTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CopyTests.kt
similarity index 94%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/CopyTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CopyTests.kt
index e73bfec..c480e75 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/CopyTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CopyTests.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.emptyMetaContainer
 import com.amazon.ionelement.api.metaContainerOf
 import org.junit.jupiter.api.Test
-import org.partiql.pig.runtime.LongPrimitive
-import org.partiql.pig.runtime.asPrimitive
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.runtime.LongPrimitive
+import org.partiql.pig.legacy.runtime.asPrimitive
+import org.partiql.pig.legacy.tests.generated.TestDomain
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertNotSame
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/CustomMetasTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CustomMetasTests.kt
similarity index 94%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/CustomMetasTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CustomMetasTests.kt
index aeae80e..7a64fc1 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/CustomMetasTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/CustomMetasTests.kt
@@ -1,10 +1,10 @@
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.metaContainerOf
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.tests.generated.TestDomain
 
 /**
  * Demonstrates and tests a custom builder implementation that allocates unique IDs to each node constructed with it.
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/EqualityTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/EqualityTests.kt
similarity index 99%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/EqualityTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/EqualityTests.kt
index 7d85a71..4c9ad65 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/EqualityTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/EqualityTests.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.ionString
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ArgumentsSource
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.tests.generated.TestDomain
 
 /** Checks `equals` and `hashCode` implementations for generated types. */
 class EqualityTests {
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerErrorTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerErrorTests.kt
similarity index 88%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerErrorTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerErrorTests.kt
index db13c69..4fc8c2e 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerErrorTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerErrorTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.IonElementLoaderOptions
 import com.amazon.ionelement.api.createIonElementLoader
@@ -21,8 +21,8 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import org.partiql.pig.runtime.MalformedDomainDataException
-import org.partiql.pig.tests.generated.PartiqlBasic
+import org.partiql.pig.legacy.runtime.MalformedDomainDataException
+import org.partiql.pig.legacy.tests.generated.PartiqlBasic
 
 class IonElementTransformerErrorTests {
     data class ErrorTestCase(val domainText: String, val message: String)
@@ -62,7 +62,7 @@ class IonElementTransformerErrorTests {
             // Incorrect type of second argument to plus
             ErrorTestCase(
                 "(plus (lit 1) (project_value (lit 1)))",
-                "1:15: Expected 'class org.partiql.pig.tests.generated.PartiqlBasic${'$'}Expr' but found 'class org.partiql.pig.tests.generated.PartiqlBasic${'$'}Projection${'$'}ProjectValue'"
+                "1:15: Expected 'class org.partiql.pig.legacy.tests.generated.PartiqlBasic${'$'}Expr' but found 'class org.partiql.pig.legacy.tests.generated.PartiqlBasic${'$'}Projection${'$'}ProjectValue'"
             ),
             // Missing record field
             ErrorTestCase(
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerTests.kt
similarity index 99%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerTests.kt
index 3a48b97..3fbcf35 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/IonElementTransformerTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/IonElementTransformerTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.loadSingleElement
 import com.amazon.ionelement.api.metaContainerOf
@@ -22,9 +22,9 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ArgumentsSource
-import org.partiql.pig.runtime.DomainNode
-import org.partiql.pig.runtime.asPrimitive
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.runtime.DomainNode
+import org.partiql.pig.legacy.runtime.asPrimitive
+import org.partiql.pig.legacy.tests.generated.TestDomain
 
 /**
  * Tests all of the equivalence classes outlined in the comment above `TestDomain` defined in
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/MultiWordDomainNamingTest.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/MultiWordDomainNamingTest.kt
similarity index 96%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/MultiWordDomainNamingTest.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/MultiWordDomainNamingTest.kt
index 26fcbdf..780aab6 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/MultiWordDomainNamingTest.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/MultiWordDomainNamingTest.kt
@@ -13,10 +13,10 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import org.junit.jupiter.api.Test
-import org.partiql.pig.tests.generated.MultiWordDomain
+import org.partiql.pig.legacy.tests.generated.MultiWordDomain
 import kotlin.test.assertEquals
 
 class MultiWordDomainNamingTest {
@@ -27,7 +27,6 @@ class MultiWordDomainNamingTest {
     @Test
     @Suppress("ComplexRedundantLet")
     fun compilesCorrectly() {
-
         // MultiWordDomain products
 
         MultiWordDomain.build { aaaAaa() }
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformSmokeTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformSmokeTests.kt
similarity index 91%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformSmokeTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformSmokeTests.kt
index db8515f..95619da 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformSmokeTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformSmokeTests.kt
@@ -13,15 +13,15 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.ionInt
 import org.junit.jupiter.api.Test
-import org.partiql.pig.runtime.asPrimitive
-import org.partiql.pig.tests.generated.ToyLang
-import org.partiql.pig.tests.generated.ToyLangIndexed
-import org.partiql.pig.tests.generated.ToyLangIndexedToToyLangVisitorTransform
-import org.partiql.pig.tests.generated.ToyLangToToyLangIndexedVisitorTransform
+import org.partiql.pig.legacy.runtime.asPrimitive
+import org.partiql.pig.legacy.tests.generated.ToyLang
+import org.partiql.pig.legacy.tests.generated.ToyLangIndexed
+import org.partiql.pig.legacy.tests.generated.ToyLangIndexedToToyLangVisitorTransform
+import org.partiql.pig.legacy.tests.generated.ToyLangToToyLangIndexedVisitorTransform
 import kotlin.test.assertEquals
 
 class PermuteTransformSmokeTests {
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformTests.kt
similarity index 96%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformTests.kt
index fa9fbca..d86ceab 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/PermuteTransformTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/PermuteTransformTests.kt
@@ -13,15 +13,15 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.fail
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ArgumentsSource
-import org.partiql.pig.tests.generated.DomainA
-import org.partiql.pig.tests.generated.DomainAToDomainBVisitorTransform
-import org.partiql.pig.tests.generated.DomainB
+import org.partiql.pig.legacy.tests.generated.DomainA
+import org.partiql.pig.legacy.tests.generated.DomainAToDomainBVisitorTransform
+import org.partiql.pig.legacy.tests.generated.DomainB
 
 /**
  * Test cases for the 5 basic scenarios for domain permutation.
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/Scope.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/Scope.kt
similarity index 97%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/Scope.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/Scope.kt
index 6a1555f..6b75769 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/Scope.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/Scope.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 sealed class Scope {
 
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/SmokeTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SmokeTests.kt
similarity index 93%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/SmokeTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SmokeTests.kt
index 4fc3371..e12d09b 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/SmokeTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SmokeTests.kt
@@ -13,15 +13,15 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.ElementType
 import com.amazon.ionelement.api.ionInt
 import com.amazon.ionelement.api.ionNull
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.partiql.pig.tests.generated.PartiqlBasic
-import org.partiql.pig.tests.generated.ToyLang
+import org.partiql.pig.legacy.tests.generated.PartiqlBasic
+import org.partiql.pig.legacy.tests.generated.ToyLang
 
 class SmokeTests {
 
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/SumConverterTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SumConverterTests.kt
similarity index 96%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/SumConverterTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SumConverterTests.kt
index 73a5f83..e027de7 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/SumConverterTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/SumConverterTests.kt
@@ -1,15 +1,15 @@
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.ionBool
 import com.amazon.ionelement.api.ionInt
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ArgumentsSource
-import org.partiql.pig.tests.generated.ToyLang
+import org.partiql.pig.legacy.tests.generated.ToyLang
 import kotlin.test.assertEquals
 
 /**
  * Tests sum converters and demonstrates their use to convert ToyLang's AST into a text representation
- * that is vaguely similar to OCaml.  This example converts from a PIG domain sum type to a string, but these
+ * that is vaguely similar to OCaml.  This example converts from a pig.legacy.domain sum type to a string, but these
  * conversions can be applied to just about anything.
  *
  * ToyLang's AST actually has two sum types: expr and operator.
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorFoldTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorFoldTests.kt
similarity index 95%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorFoldTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorFoldTests.kt
index e6578cb..2ac88c0 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorFoldTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorFoldTests.kt
@@ -13,12 +13,12 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.MetaContainer
 import org.junit.jupiter.api.Test
-import org.partiql.pig.runtime.LongPrimitive
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.runtime.LongPrimitive
+import org.partiql.pig.legacy.tests.generated.TestDomain
 import kotlin.test.assertEquals
 
 private const val NUMBER_KEY = "number"
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTests.kt
similarity index 94%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTests.kt
index 7af7c3d..fe955b8 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTests.kt
@@ -13,13 +13,13 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.MetaContainer
 import org.junit.jupiter.api.Test
-import org.partiql.pig.runtime.LongPrimitive
-import org.partiql.pig.runtime.SymbolPrimitive
-import org.partiql.pig.tests.generated.TestDomain
+import org.partiql.pig.legacy.runtime.LongPrimitive
+import org.partiql.pig.legacy.runtime.SymbolPrimitive
+import org.partiql.pig.legacy.tests.generated.TestDomain
 import kotlin.test.assertEquals
 
 private const val NUMBER_KEY = "number"
diff --git a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTransformTests.kt b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTransformTests.kt
similarity index 94%
rename from pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTransformTests.kt
rename to pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTransformTests.kt
index bb7ce40..14a9faa 100644
--- a/pig-tests/src/test/kotlin/org/partiql/pig/tests/VisitorTransformTests.kt
+++ b/pig-tests/src/test/kotlin/org/partiql/pig/legacy/tests/VisitorTransformTests.kt
@@ -13,16 +13,16 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.tests
+package org.partiql.pig.legacy.tests
 
 import com.amazon.ionelement.api.ionInt
 import com.amazon.ionelement.api.metaContainerOf
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.partiql.pig.runtime.LongPrimitive
-import org.partiql.pig.runtime.SymbolPrimitive
-import org.partiql.pig.tests.generated.TestDomain
-import org.partiql.pig.tests.generated.ToyLang
+import org.partiql.pig.legacy.runtime.LongPrimitive
+import org.partiql.pig.legacy.runtime.SymbolPrimitive
+import org.partiql.pig.legacy.tests.generated.TestDomain
+import org.partiql.pig.legacy.tests.generated.ToyLang
 import kotlin.test.assertNotSame
 import kotlin.test.assertSame
 
@@ -142,7 +142,8 @@ class VisitorTransformTests {
         val input = TestDomain.build { intPair(1, 2) }
         val output = object : TestDomain.VisitorTransform() { }.transformIntPair(input)
         assertSame(
-            input, output,
+            input,
+            output,
             "Expected same instance of IntPair to be returned from a VisitorTransform " +
                 "that doesn't change it."
         )
@@ -154,7 +155,8 @@ class VisitorTransformTests {
         val input = TestDomain.build { boolPair(true, false) }
         val output = object : TestDomain.VisitorTransform() { }.transformBoolPair(input)
         assertSame(
-            input, output,
+            input,
+            output,
             "Expected same instance of BoolPair to be returned from a VisitorTransform " +
                 "that doesn't change it."
         )
@@ -165,7 +167,8 @@ class VisitorTransformTests {
         val input = TestDomain.build { symbolPair("a", "b") }
         val output = object : TestDomain.VisitorTransform() { }.transformSymbolPair(input)
         assertSame(
-            input, output,
+            input,
+            output,
             "Expected same instance of SymbolPair to be returned from a VisitorTransform " +
                 "that doesn't change it."
         )
@@ -190,12 +193,14 @@ class VisitorTransformTests {
         assertNotSame(input, output, "The root node has a changed child, therefore it should also be changed.")
 
         assertSame(
-            input.first, output.first,
+            input.first,
+            output.first,
             "The `first` element of the root is unchanged from its original, therefore should not be changed."
         )
 
         assertNotSame(
-            input.second, output.second,
+            input.second,
+            output.second,
             "The `second` element is changed, and therefore should be a new instance."
         )
     }
diff --git a/pig/build.gradle.kts b/pig/build.gradle.kts
index 6c83308..175beea 100644
--- a/pig/build.gradle.kts
+++ b/pig/build.gradle.kts
@@ -12,65 +12,73 @@
  * express or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
+import java.io.ByteArrayOutputStream
 import java.io.FileOutputStream
 import java.util.Properties
 
 plugins {
-    id("application")
-    id("pig.conventions")
-    id("pig.publish")
+    id(Plugins.conventions)
+    id(Plugins.application)
+    id(Plugins.publish)
 }
 
-project.description = "The P.I.G. is a code generator for domain models such ASTs and execution plans."
-
-val propertiesDir = "$buildDir/properties"
-
 dependencies {
-    implementation("org.freemarker:freemarker:2.3.30")
-    implementation("net.sf.jopt-simple:jopt-simple:5.0.4")
-    implementation("com.amazon.ion:ion-element:1.0.0")
+    implementation(Deps.dotlin)
+    implementation(Deps.freemarker)
+    implementation(Deps.ionElement)
+    implementation(Deps.kasechange)
+    implementation(Deps.kotlinPoet)
+    implementation(Deps.picoCli)
 }
 
 application {
-    mainClass.set("org.partiql.pig.MainKt")
+    applicationName = "pig"
+    mainClass.set("org.partiql.pig.PigKt")
 }
 
-tasks.jar {
-    manifest {
-        attributes["Main-Class"] = "org.partiql.pig.MainKt"
+distributions {
+    main {
+        distributionBaseName.set("pig")
     }
-    from(
-        configurations.compile.get().map {
-            if (it.isDirectory) {
-                it
-            } else {
-                zipTree(it)
-            }
-        }
-    )
 }
 
-tasks.register("generateProperties") {
-    doLast {
-        val propertiesFile = file("$propertiesDir/pig.properties")
-        propertiesFile.parentFile.mkdirs()
-        val properties = Properties()
-        properties.setProperty("version", version.toString())
-        val out = FileOutputStream(propertiesFile)
-        properties.store(out, null)
-    }
+tasks.register<GradleBuild>("install") {
+    tasks = listOf("assembleDist", "distZip", "installDist")
 }
 
-tasks.named("processResources") {
-    dependsOn("generateProperties")
+publish {
+    artifactId = "pig"
+    name = "PartiQL I.R. Generator (a.k.a P.I.G.)"
 }
 
+val generatedVersion = "$buildDir/generated-version"
+
 sourceSets {
     main {
-        output.dir(propertiesDir)
+        output.dir(generatedVersion)
     }
 }
 
-tasks.build {
-    finalizedBy(tasks.installDist)
+tasks.processResources {
+    dependsOn(tasks.findByName("generateVersionAndHash"))
+}
+
+tasks.create("generateVersionAndHash") {
+    val propertiesFile = file("$generatedVersion/pig.properties")
+    propertiesFile.parentFile.mkdirs()
+    val properties = Properties()
+    // Version
+    val version = version.toString()
+    properties.setProperty("version", version)
+    // Commit Hash
+    val commit = ByteArrayOutputStream().apply {
+        exec {
+            commandLine = listOf("git", "rev-parse", "--short", "HEAD")
+            standardOutput = this@apply
+        }
+    }.toString().trim()
+    properties.setProperty("commit", commit)
+    // Write file
+    val out = FileOutputStream(propertiesFile)
+    properties.store(out, null)
 }
diff --git a/pig/src/main/kotlin/org/partiql/pig/Pig.kt b/pig/src/main/kotlin/org/partiql/pig/Pig.kt
new file mode 100644
index 0000000..ae1b8d7
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/Pig.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig
+
+import org.partiql.pig.generator.target.kotlin.KotlinCommand
+import org.partiql.pig.legacy.LegacyCommand
+import picocli.CommandLine
+import java.io.IOException
+import java.util.Properties
+import kotlin.system.exitProcess
+
+fun main(args: Array<String>) {
+    val command = CommandLine(Pig()).setCaseInsensitiveEnumValuesAllowed(true)
+    exitProcess(command.execute(*args))
+}
+
+@CommandLine.Command(
+    name = "pig",
+    subcommands = [Generate::class, LegacyCommand::class]
+)
+class Pig : Runnable {
+
+    @CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["display this help message"])
+    var help = false
+
+    @CommandLine.Option(names = ["-v", "--version"], description = ["Prints current version"])
+    var version = false
+
+    override fun run() {
+        if (version) {
+            val properties = Properties()
+            val version = try {
+                properties.load(this.javaClass.getResourceAsStream("/pig.properties"))
+                properties.getProperty("version")
+            } catch (ex: IOException) {
+                "?"
+            }
+            println(version)
+        }
+    }
+}
+
+@CommandLine.Command(
+    name = "generate",
+    subcommands = [KotlinCommand::class],
+    description = ["PartiQL IR Generator 1.x"]
+)
+class Generate : Runnable {
+
+    @CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["display this help message"])
+    var help = false
+
+    override fun run() {}
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/cmdline/CommandLineParser.kt b/pig/src/main/kotlin/org/partiql/pig/cmdline/CommandLineParser.kt
deleted file mode 100644
index 75aacd2..0000000
--- a/pig/src/main/kotlin/org/partiql/pig/cmdline/CommandLineParser.kt
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- *  permissions and limitations under the License.
- */
-
-package org.partiql.pig.cmdline
-
-import joptsimple.BuiltinHelpFormatter
-import joptsimple.OptionDescriptor
-import joptsimple.OptionException
-import joptsimple.OptionParser
-import joptsimple.ValueConversionException
-import joptsimple.ValueConverter
-import java.io.File
-import java.io.PrintStream
-import java.util.Properties
-
-class CommandLineParser {
-    private enum class LanguageTargetType(
-        val requireNamespace: Boolean,
-        val requireTemplateFile: Boolean,
-        val requireOutputFile: Boolean,
-        val requireOutputDirectory: Boolean
-    ) {
-        KOTLIN(requireNamespace = true, requireTemplateFile = false, requireOutputFile = false, requireOutputDirectory = true),
-        CUSTOM(requireNamespace = false, requireTemplateFile = true, requireOutputFile = true, requireOutputDirectory = false),
-        HTML(requireNamespace = false, requireTemplateFile = false, requireOutputFile = true, requireOutputDirectory = false),
-        ION(requireNamespace = false, requireTemplateFile = false, requireOutputFile = true, requireOutputDirectory = false)
-    }
-
-    private object LanguageTargetTypeValueConverter : ValueConverter<LanguageTargetType> {
-        private val lookup = LanguageTargetType.values().associateBy { it.name.toLowerCase() }
-
-        override fun convert(value: String?): LanguageTargetType {
-            if (value == null) throw ValueConversionException("Value was null")
-            return lookup[value] ?: throw ValueConversionException("Invalid language target type: $value")
-        }
-
-        override fun valueType(): Class<out LanguageTargetType> {
-            return LanguageTargetType::class.java
-        }
-
-        override fun valuePattern(): String {
-            return LanguageTargetType.values().map { it.name.toLowerCase() }.joinToString("|")
-        }
-    }
-
-    private object DomainFilterValueConverter : ValueConverter<Set<String>> {
-        override fun convert(value: String?): Set<String> {
-            if (value.isNullOrBlank()) throw ValueConversionException("Value was empty")
-            return value.split(',').map(String::trim).toSet()
-        }
-
-        override fun valueType(): Class<out Set<String>>? = null
-
-        override fun valuePattern(): String {
-            return "<domain 1>,<domain 2>,..."
-        }
-    }
-
-    private val formatter = object : BuiltinHelpFormatter(120, 2) {
-        override fun format(options: MutableMap<String, out OptionDescriptor>?): String {
-            return """PartiQL I.R. Generator
-                |
-                |${super.format(options)}
-                |Each target requires certain arguments:
-                |
-                |   --target=kotlin requires --namespace=<ns> and --output-directory=<out-dir>
-                |   --target=custom requires --template=<path-to-template> and --output-file=<generated-file>
-                |   --target=html   requires --output-file=<output-html-file>
-                |   --target=ion    requires --output-file=<output-ion-file>
-                |
-                |Notes:
-                |
-                |   If -d or --output-directory is specified and the directory does not exist, it will be created. 
-                | 
-                |Examples:
-                |
-                |  pig --target=kotlin \   
-                |      --universe=universe.ion \ 
-                |      --output-directory=generated-src \
-                |      --namespace=org.example.domain
-                |  
-                |  pig --target=custom \
-                |      --universe=universe.ion \ 
-                |      --output-file=example.txt \
-                |      --template=template.ftl 
-                |     
-                |  pig --target=ion \
-                |      --universe=universe.ion \ 
-                |      --output-file=example.ion
-                |     
-        """.trimMargin()
-        }
-    }
-    private val optParser = OptionParser().also { it.formatHelpWith(formatter) }
-
-    private val helpOpt = optParser.acceptsAll(listOf("help", "h", "?"), "Prints this help")
-        .forHelp()
-
-    private val versionOpt = optParser.acceptsAll(listOf("version", "v"), "Prints current version")
-        .forHelp()
-
-    private val universeOpt = optParser.acceptsAll(listOf("universe", "u"), "Type universe input file")
-        .withRequiredArg()
-        .ofType(File::class.java)
-        .required()
-
-    private val targetTypeOpt = optParser.acceptsAll(listOf("target", "t"), "Target language")
-        .withRequiredArg()
-        .withValuesConvertedBy(LanguageTargetTypeValueConverter)
-        .required()
-
-    private val outputFileOpt = optParser.acceptsAll(listOf("output-file", "o"), "Generated output file (for targets that output a single file)")
-        .withRequiredArg()
-        .ofType(File::class.java)
-
-    private val outputDirectoryOpt = optParser.acceptsAll(listOf("output-directory", "d"), "Generated output directory (for targets that output multiple files)")
-        .withRequiredArg()
-        .ofType(File::class.java)
-
-    private val namespaceOpt = optParser.acceptsAll(listOf("namespace", "n"), "Namespace for generated code")
-        .withOptionalArg()
-        .ofType(String::class.java)
-
-    private val templateOpt = optParser.acceptsAll(listOf("template", "e"), "Path to an Apache FreeMarker template")
-        .withOptionalArg()
-        .ofType(File::class.java)
-
-    private val properties = Properties()
-
-    private val domainsOpt = optParser.acceptsAll(listOf("domains", "f"), "List of domains to generate (comma separated)")
-        .withOptionalArg()
-        .withValuesConvertedBy(DomainFilterValueConverter)
-
-    init {
-        properties.load(this.javaClass.getResourceAsStream("/pig.properties"))
-    }
-
-    /**
-     * Prints help to the specified [PrintStream].
-     */
-    fun printHelp(out: PrintStream) {
-        optParser.printHelpOn(out)
-    }
-
-    /**
-     * Prints version specified in the package root build.gradle
-     */
-    fun printVersion(out: PrintStream) {
-        out.println("PartiQL I.R. Generator Version ${properties.getProperty("version")}")
-    }
-
-    /**
-     * Parses the command-line arguments.
-     *
-     * Returns `null` if the command-line arguments were invalid or
-     */
-    fun parse(args: Array<String>): Command {
-        return try {
-            val optSet = optParser.parse(*args)
-
-            when {
-                optSet.has(helpOpt) -> Command.ShowHelp
-                optSet.has(versionOpt) -> Command.ShowVersion
-                else -> {
-                    // !! is fine in this case since we define these options as .required() above.
-                    val typeUniverseFile: File = optSet.valueOf(universeOpt)!!
-                    val targetType = optSet.valueOf(targetTypeOpt)!!
-
-                    // --namespace
-                    if (targetType.requireNamespace) {
-                        if (!optSet.has(namespaceOpt)) {
-                            return Command.InvalidCommandLineArguments(
-                                "The selected language target requires the --namespace argument"
-                            )
-                        }
-                    } else if (optSet.has(namespaceOpt)) {
-                        return Command.InvalidCommandLineArguments(
-                            "The selected language target does not allow the --namespace argument"
-                        )
-                    }
-
-                    // --output-file
-                    if (targetType.requireOutputFile) {
-                        if (!optSet.has(outputFileOpt)) {
-                            return Command.InvalidCommandLineArguments(
-                                "The selected language target requires the --output-file argument"
-                            )
-                        }
-                    } else if (optSet.has(outputFileOpt)) {
-                        return Command.InvalidCommandLineArguments(
-                            "The selected language target does not allow the --output-file argument"
-                        )
-                    }
-
-                    // --output-directory
-                    if (targetType.requireOutputDirectory) {
-                        if (!optSet.has(outputDirectoryOpt)) {
-                            return Command.InvalidCommandLineArguments(
-                                "The selected language target requires the --output-directory argument"
-                            )
-                        }
-                    } else if (optSet.has(outputDirectoryOpt)) {
-                        return Command.InvalidCommandLineArguments(
-                            "The selected language target does not allow the --output-directory argument"
-                        )
-                    }
-
-                    // --template
-                    if (targetType.requireTemplateFile) {
-                        if (!optSet.has(templateOpt)) {
-                            return Command.InvalidCommandLineArguments("The selected language target requires the --template argument")
-                        }
-                    } else if (optSet.has(templateOpt)) {
-                        return Command.InvalidCommandLineArguments(
-                            "The selected language target does not allow the --template argument"
-                        )
-                    }
-
-                    val domains = optSet.valueOf(domainsOpt)
-
-                    val target = when (targetType) {
-                        LanguageTargetType.HTML -> TargetLanguage.Html(
-                            outputFile = optSet.valueOf(outputFileOpt) as File,
-                            domains = domains
-                        )
-                        LanguageTargetType.KOTLIN -> TargetLanguage.Kotlin(
-                            namespace = optSet.valueOf(namespaceOpt) as String,
-                            outputDirectory = optSet.valueOf(outputDirectoryOpt) as File,
-                            domains = domains
-                        )
-                        LanguageTargetType.CUSTOM -> TargetLanguage.Custom(
-                            templateFile = optSet.valueOf(templateOpt),
-                            outputFile = optSet.valueOf(outputFileOpt) as File,
-                            domains = domains
-                        )
-                        LanguageTargetType.ION -> TargetLanguage.Ion(
-                            outputFile = optSet.valueOf(outputFileOpt) as File,
-                            domains = domains
-                        )
-                    }
-
-                    Command.Generate(typeUniverseFile, target)
-                }
-            }
-        } catch (ex: OptionException) {
-            Command.InvalidCommandLineArguments(ex.message!!)
-        }
-    }
-}
diff --git a/pig/src/main/kotlin/org/partiql/pig/errors/Exceptions.kt b/pig/src/main/kotlin/org/partiql/pig/errors/Exceptions.kt
index 73a0f95..c1f3d4f 100644
--- a/pig/src/main/kotlin/org/partiql/pig/errors/Exceptions.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/errors/Exceptions.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.errors
+package org.partiql.pig.legacy.errors
 
 class PigException(val error: PigError, cause: Throwable? = null) : Exception(error.toString(), cause)
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/errors/PigError.kt b/pig/src/main/kotlin/org/partiql/pig/errors/PigError.kt
index 8d08784..9f95c81 100644
--- a/pig/src/main/kotlin/org/partiql/pig/errors/PigError.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/errors/PigError.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.errors
+package org.partiql.pig.legacy.errors
 
 import com.amazon.ionelement.api.IonLocation
 import com.amazon.ionelement.api.locationToString
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/Generator.kt b/pig/src/main/kotlin/org/partiql/pig/generator/Generator.kt
new file mode 100644
index 0000000..254aa8a
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/Generator.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator
+
+import org.partiql.pig.model.Universe
+
+/**
+ * Interface for a Pig generator
+ */
+interface Generator<T> {
+
+    fun generate(universe: Universe): T
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinCommand.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinCommand.kt
new file mode 100644
index 0000000..609544e
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinCommand.kt
@@ -0,0 +1,83 @@
+package org.partiql.pig.generator.target.kotlin
+
+import org.partiql.pig.parser.PigParser
+import picocli.CommandLine
+import java.io.BufferedReader
+import java.io.File
+import java.io.FileInputStream
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.concurrent.Callable
+
+@CommandLine.Command(
+    name = "kotlin",
+    description = ["Generates Kotlin sources from type universe definitions"]
+)
+class KotlinCommand : Callable<Int> {
+
+    @CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["display this help message"])
+    var help = false
+
+    @CommandLine.Parameters(
+        index = "0",
+        description = ["Type definition file"]
+    )
+    lateinit var file: File
+
+    @CommandLine.Option(
+        names = ["-p", "--package"],
+        description = ["Package root"]
+    )
+    lateinit var packageRoot: String
+
+    @CommandLine.Option(
+        names = ["-u", "--universe"],
+        description = ["Universe identifier"]
+    )
+    lateinit var id: String
+
+    @CommandLine.Option(
+        names = ["-o", "--out"],
+        description = ["Generated source output directory"]
+    )
+    lateinit var out: Path
+
+    @CommandLine.Option(
+        names = ["--poems"],
+        split = ",",
+        description = ["Poem templates to apply"]
+    )
+    var poems: List<String> = emptyList()
+
+    @CommandLine.Option(
+        names = ["-m", "--modifier"],
+        description = ["Generated node class modifier. Options \${COMPLETION-CANDIDATES}"],
+        defaultValue = "DATA"
+    )
+    lateinit var modifier: KotlinNodeOptions.Modifier
+
+    override fun call(): Int {
+        val input = BufferedReader(FileInputStream(file).reader()).readText()
+        val parser = PigParser.default()
+        val universe = parser.parse(id, input)
+        val options = KotlinOptions(
+            packageRoot = packageRoot,
+            poems = poems,
+            node = KotlinNodeOptions(
+                modifier = modifier
+            )
+        )
+        val generator = KotlinGenerator(options)
+        val result = generator.generate(universe)
+        // Write all generated files
+        result.write {
+            val p = it.packageName.replace(".", "/")
+            val dir = out.resolve(p).toAbsolutePath()
+            Files.createDirectories(dir)
+            val file = Files.newBufferedWriter(dir.resolve("${it.name}.kt"))
+            it.writeTo(file)
+            file.close()
+        }
+        return 0
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinGenerator.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinGenerator.kt
new file mode 100644
index 0000000..1e0ee87
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinGenerator.kt
@@ -0,0 +1,141 @@
+package org.partiql.pig.generator.target.kotlin
+
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeSpec
+import net.pearx.kasechange.toCamelCase
+import org.partiql.pig.generator.Generator
+import org.partiql.pig.generator.target.kotlin.poems.KotlinBuilderPoem
+import org.partiql.pig.generator.target.kotlin.poems.KotlinJacksonPoem
+import org.partiql.pig.generator.target.kotlin.poems.KotlinListenerPoem
+import org.partiql.pig.generator.target.kotlin.poems.KotlinMetasPoem
+import org.partiql.pig.generator.target.kotlin.poems.KotlinVisitorPoem
+import org.partiql.pig.generator.target.kotlin.spec.KotlinFileSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+import org.partiql.pig.model.TypeDef
+import org.partiql.pig.model.TypeProp
+import org.partiql.pig.model.Universe
+
+/**
+ * Generates and applies
+ */
+class KotlinGenerator(private val options: KotlinOptions) : Generator<KotlinResult> {
+
+    override fun generate(universe: Universe): KotlinResult {
+        // --- Initialize an empty symbol table(?)
+        val symbols = KotlinSymbols.init(universe, options)
+
+        // Still not sure if poems should be registered with an injector
+        // This is sufficient for now
+        val poems = options.poems.map {
+            when (it) {
+                "visitor" -> KotlinVisitorPoem(symbols)
+                "builder" -> KotlinBuilderPoem(symbols)
+                "listener" -> KotlinListenerPoem(symbols)
+                "metas" -> KotlinMetasPoem(symbols)
+                "jackson" -> KotlinJacksonPoem(symbols)
+                else -> error("unknown poem $it, expected: visitor, builder, listener, metas, jackson")
+            }
+        }
+
+        // --- Generate skeleton
+        val spec = KotlinUniverseSpec(
+            universe = universe,
+            nodes = universe.nodes(symbols),
+            base = TypeSpec.classBuilder(symbols.base).addModifiers(KModifier.ABSTRACT),
+            types = universe.types(symbols)
+        )
+        val specs = with(spec) {
+            // Apply each poem
+            poems.forEach { it.apply(this) }
+            // Finalize each spec/builder
+            build(options.packageRoot).map { KotlinFileSpec(it) }
+        }
+        return KotlinResult(specs)
+    }
+
+    // --- Internal -----------------------------------
+
+    /**
+     * Generate a NodeSpec for each Type in the given Universe
+     */
+    private fun Universe.nodes(symbols: KotlinSymbols): List<KotlinNodeSpec> = types.mapNotNull { it.generate(symbols) }
+        .map {
+            it.builder.superclass(symbols.base)
+            it
+        }
+
+    /**
+     * Generate all top-level enums as these are not children of a product definition
+     */
+    private fun Universe.types(symbols: KotlinSymbols) = types.filterIsInstance<TypeDef.Enum>()
+        .map { it.generate(symbols) }
+        .toMutableList()
+
+    /**
+     * Entry point for node generation.
+     */
+    private fun TypeDef.generate(symbols: KotlinSymbols): KotlinNodeSpec? = when (this) {
+        is TypeDef.Product -> this.generate(symbols)
+        is TypeDef.Sum -> this.generate(symbols)
+        is TypeDef.Enum -> null // enums are constants, not nodes
+    }
+
+    /**
+     * Product Node Generation
+     */
+    private fun TypeDef.Product.generate(symbols: KotlinSymbols) = KotlinNodeSpec.Product(
+        product = this,
+        props = props.map { KotlinNodeSpec.Prop(it.name.toCamelCase(), symbols.typeNameOf(it.ref)) },
+        nodes = children.mapNotNull { it.generate(symbols) },
+        clazz = symbols.clazz(ref),
+        ext = (props.enumProps(symbols) + types.enums(symbols)).toMutableList()
+    ).apply {
+        props.forEach {
+            val para = ParameterSpec.builder(it.name, it.type).build()
+            val prop = PropertySpec.builder(it.name, it.type).initializer(it.name).build()
+            builder.addProperty(prop)
+            constructor.addParameter(para)
+        }
+        when (options.node.modifier) {
+            KotlinNodeOptions.Modifier.FINAL -> {}
+            KotlinNodeOptions.Modifier.DATA -> if (props.isNotEmpty()) builder.addModifiers(KModifier.DATA)
+            KotlinNodeOptions.Modifier.OPEN -> builder.addModifiers(KModifier.OPEN)
+        }
+        nodes.forEach { it.builder.superclass(symbols.base) }
+    }
+
+    /**
+     * Sum node generation
+     */
+    private fun TypeDef.Sum.generate(symbols: KotlinSymbols) = KotlinNodeSpec.Sum(
+        sum = this,
+        variants = variants.mapNotNull { it.generate(symbols) },
+        nodes = types.mapNotNull { it.generate(symbols) },
+        clazz = symbols.clazz(ref),
+        ext = types.enums(symbols).toMutableList()
+    ).apply {
+        variants.forEach { it.builder.superclass(clazz) }
+        nodes.forEach { it.builder.superclass(symbols.base) }
+    }
+
+    /**
+     * Enum constant generation
+     */
+    private fun TypeDef.Enum.generate(symbols: KotlinSymbols) = TypeSpec.enumBuilder(symbols.clazz(ref))
+        .apply { values.forEach { addEnumConstant(it) } }
+        .build()
+
+    private fun List<TypeProp>.enumProps(symbols: KotlinSymbols) = filterIsInstance<TypeProp.Inline>().mapNotNull {
+        when (it.def) {
+            is TypeDef.Enum -> it.def.generate(symbols)
+            else -> null
+        }
+    }
+
+    private fun List<TypeDef>.enums(symbols: KotlinSymbols) = filterIsInstance<TypeDef.Enum>().map {
+        it.generate(symbols)
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinOptions.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinOptions.kt
new file mode 100644
index 0000000..ae5b99c
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinOptions.kt
@@ -0,0 +1,26 @@
+package org.partiql.pig.generator.target.kotlin
+
+/**
+ * Generator options are entirely independent of the type definitions
+ *
+ * @property packageRoot
+ */
+class KotlinOptions(
+    val packageRoot: String,
+    val poems: List<String>,
+    val node: KotlinNodeOptions = KotlinNodeOptions()
+)
+
+/**
+ * Consider other options as this is Kotlin specific
+ */
+class KotlinNodeOptions(
+    val modifier: Modifier = Modifier.FINAL
+) {
+
+    enum class Modifier {
+        FINAL,
+        DATA,
+        OPEN
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinPoem.kt
new file mode 100644
index 0000000..d6d3842
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinPoem.kt
@@ -0,0 +1,28 @@
+package org.partiql.pig.generator.target.kotlin
+
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+
+abstract class KotlinPoem(val symbols: KotlinSymbols) {
+
+    abstract val id: String
+
+    open fun apply(universe: KotlinUniverseSpec) {
+        universe.nodes.forEach { apply(it) }
+    }
+
+    open fun apply(node: KotlinNodeSpec) {
+        when (node) {
+            is KotlinNodeSpec.Product -> apply(node)
+            is KotlinNodeSpec.Sum -> apply(node)
+        }
+    }
+
+    open fun apply(node: KotlinNodeSpec.Product) {
+        node.children.forEach { apply(it) }
+    }
+
+    open fun apply(node: KotlinNodeSpec.Sum) {
+        node.children.forEach { apply(it) }
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinResult.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinResult.kt
new file mode 100644
index 0000000..c2f2107
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinResult.kt
@@ -0,0 +1,8 @@
+package org.partiql.pig.generator.target.kotlin
+
+import org.partiql.pig.generator.target.kotlin.spec.KotlinFileSpec
+
+class KotlinResult(private val specs: List<KotlinFileSpec>) {
+
+    fun write(action: (KotlinFileSpec) -> Unit) = specs.forEach(action)
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinSymbols.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinSymbols.kt
new file mode 100644
index 0000000..2ac138e
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/KotlinSymbols.kt
@@ -0,0 +1,201 @@
+package org.partiql.pig.generator.target.kotlin
+
+import com.squareup.kotlinpoet.BOOLEAN
+import com.squareup.kotlinpoet.BYTE_ARRAY
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.DOUBLE
+import com.squareup.kotlinpoet.FLOAT
+import com.squareup.kotlinpoet.INT
+import com.squareup.kotlinpoet.LIST
+import com.squareup.kotlinpoet.LONG
+import com.squareup.kotlinpoet.MAP
+import com.squareup.kotlinpoet.MUTABLE_LIST
+import com.squareup.kotlinpoet.MUTABLE_MAP
+import com.squareup.kotlinpoet.MUTABLE_SET
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.SET
+import com.squareup.kotlinpoet.STRING
+import com.squareup.kotlinpoet.TypeName
+import net.pearx.kasechange.toCamelCase
+import net.pearx.kasechange.toPascalCase
+import org.partiql.pig.model.ScalarType
+import org.partiql.pig.model.TypeDef
+import org.partiql.pig.model.TypeRef
+import org.partiql.pig.model.Universe
+
+/**
+ * A lookup for type references in code generation
+ *
+ * @property universe
+ * @property options
+ *
+ * TODO consider thread safe memoization — that was removed because of iterating the refs while updating the backing map
+ */
+class KotlinSymbols private constructor(
+    private val universe: Universe,
+    private val options: KotlinOptions
+) {
+
+    /**
+     * Kotlin/Java package name
+     */
+    val rootPackage = options.packageRoot
+
+    /**
+     * Universe identifier often prefixed to generated classes
+     */
+    val rootId = universe.id.toPascalCase()
+
+    /**
+     * Base node for the Universe
+     */
+    val base: ClassName = ClassName(rootPackage, "${rootId}Node")
+
+    /**
+     * Memoize converting a TypeRef.Path to a camel case identifier to be used as method/function names
+     */
+    private val camels: MutableMap<TypeRef.Path, String> = mutableMapOf()
+
+    /**
+     * Memoize converting a TypeRef.Path to a pascal case identifier
+     */
+    private val pascals: MutableMap<TypeRef.Path, String> = mutableMapOf()
+
+    /**
+     * Map all type references back to their definitions. Use `id` as to not include `nullable` in the key `equals`
+     */
+    private val defs: Map<String, TypeDef> by lazy {
+        val d = mutableMapOf<String, TypeDef>()
+        universe.forEachType { d[it.ref.id] = it }
+        d
+    }
+
+    companion object {
+
+        /**
+         * Named constructor somewhat hints at the initial emptiness (when memoized) of the symbol table
+         */
+        fun init(universe: Universe, options: KotlinOptions): KotlinSymbols = KotlinSymbols(universe, options)
+    }
+
+    /**
+     * Returns the base ClassName for the given TypeRef.Path
+     */
+    fun clazz(ref: TypeRef.Path) = ClassName(
+        packageName = rootPackage,
+        simpleNames = ref.path.map { it.toPascalCase() }
+    )
+
+    /**
+     * Returns a camel-case representation of the path.
+     *   - This causes naming conflicts, i.e. the path `a_b` conflicts with the path `a.b`
+     *   - I'd prefer to start with this naive approach
+     */
+    fun camel(ref: TypeRef.Path): String = camels.computeIfAbsent(ref) {
+        ref.path.joinToString("_").toCamelCase()
+    }
+
+    /**
+     * Again, this causes naming conflicts for names like `a_b` and `a.b`
+     */
+    fun pascal(ref: TypeRef.Path): String = pascals.computeIfAbsent(ref) {
+        ref.path.joinToString("_").toPascalCase()
+    }
+
+    // fun def(ref: TypeRef.Path): TypeDef = defs[ref.id] ?: error("no definition found for type `$ref`")
+    fun def(ref: TypeRef.Path): TypeDef {
+        val def = defs[ref.id]
+        if (def == null) {
+            error("no definition found for type `$ref`")
+        } else {
+            return def
+        }
+    }
+
+    /**
+     * Computes a type name for the given [TypeRef]
+     */
+    fun typeNameOf(ref: TypeRef, mutable: Boolean = false): TypeName = when (ref) {
+        is TypeRef.Scalar -> typeNameOf(ref)
+        is TypeRef.Path -> clazz(ref)
+        is TypeRef.List -> typeNameOf(ref, mutable)
+        is TypeRef.Set -> typeNameOf(ref, mutable)
+        is TypeRef.Map -> typeNameOf(ref, mutable)
+        is TypeRef.Import -> import(ref.symbol)
+    }.copy(ref.nullable)
+
+    // --- Internal -------------------------------
+
+    private fun typeNameOf(ref: TypeRef.Scalar) = when (ref.type) {
+        ScalarType.BOOL -> BOOLEAN
+        ScalarType.INT -> INT
+        ScalarType.LONG -> LONG
+        ScalarType.FLOAT -> FLOAT
+        ScalarType.DOUBLE -> DOUBLE
+        ScalarType.BYTES -> BYTE_ARRAY
+        ScalarType.STRING -> STRING
+    }
+
+    private fun typeNameOf(ref: TypeRef.List, mutable: Boolean = false): TypeName {
+        val t = typeNameOf(ref.type, mutable)
+        val list = if (mutable) MUTABLE_LIST else LIST
+        return list.parameterizedBy(t)
+    }
+
+    private fun typeNameOf(ref: TypeRef.Set, mutable: Boolean = false): TypeName {
+        val t = typeNameOf(ref.type, mutable)
+        val set = if (mutable) MUTABLE_SET else SET
+        return set.parameterizedBy(t)
+    }
+
+    private fun typeNameOf(ref: TypeRef.Map, mutable: Boolean = false): TypeName {
+        val kt = typeNameOf(ref.keyType)
+        val vt = typeNameOf(ref.valType)
+        val map = if (mutable) MUTABLE_MAP else MAP
+        return map.parameterizedBy(kt, vt)
+    }
+
+    /**
+     * Determine the appropriate mapping method from a JsonNode to the Kotlin value; this could certainly be improved.
+     * https://fasterxml.github.io/jackson-databind/javadoc/2.7/com/fasterxml/jackson/databind/JsonNode.html
+     */
+    fun valueMapping(ref: TypeRef, v: String): String = when (ref) {
+        is TypeRef.List -> "$v.map { n -> ${valueMapping(ref.type, "n")} }"
+        is TypeRef.Map -> "$v.fields().asSequence().associate { e -> e.key to ${valueMapping(ref.valType, "e.value")} }"
+        is TypeRef.Set -> "$v.map { n -> ${valueMapping(ref.type, "n")} }.toSet()"
+        is TypeRef.Scalar -> when (ref.type) {
+            ScalarType.BOOL -> "$v.asBoolean()"
+            ScalarType.INT -> "$v.asInt()"
+            ScalarType.LONG -> "$v.asLong()"
+            ScalarType.FLOAT -> "$v.floatValue()"
+            ScalarType.DOUBLE -> "$v.asDouble()"
+            ScalarType.BYTES -> "$v.binaryValue()"
+            ScalarType.STRING -> "$v.asText()"
+        }
+        is TypeRef.Path -> {
+            when (def(ref)) {
+                is TypeDef.Enum -> "${clazz(ref).canonicalName}.valueOf($v.asText().uppercase())"
+                is TypeDef.Product,
+                is TypeDef.Sum -> "_${camel(ref)}($v)"
+            }
+        }
+        // invoke the default deserializer
+        is TypeRef.Import -> "ctxt.readValue($v, ${import(ref.symbol).canonicalName}.javaClass)"
+    }
+
+    /**
+     * Parse the ClassLoader string to a KotlinPoet ClassName. Could improve error handling here..
+     */
+    private fun import(symbol: String): ClassName {
+        if (!universe.imports.containsKey("kotlin")) {
+            error("Missing `kotlin` target from imports")
+        } else if (!universe.imports["kotlin"]!!.containsKey(symbol)) {
+            error("Missing `kotlin` target for `$symbol` in imports")
+        }
+        val path = universe.imports["kotlin"]!![symbol]!!
+        val i = path.lastIndexOf(".")
+        val packageName = path.substring(0, i)
+        val simpleNames = path.substring(i + 1).split("$")
+        return ClassName(packageName, simpleNames)
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinBuilderPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinBuilderPoem.kt
new file mode 100644
index 0000000..52964fc
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinBuilderPoem.kt
@@ -0,0 +1,235 @@
+package org.partiql.pig.generator.target.kotlin.poems
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.LambdaTypeName
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.TypeVariableName
+import com.squareup.kotlinpoet.asTypeName
+import net.pearx.kasechange.toCamelCase
+import net.pearx.kasechange.toPascalCase
+import org.partiql.pig.generator.target.kotlin.KotlinPoem
+import org.partiql.pig.generator.target.kotlin.KotlinSymbols
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinPackageSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+import org.partiql.pig.generator.target.kotlin.types.Annotations
+import org.partiql.pig.model.TypeRef
+
+/**
+ * Poem which creates a DSL for instantiation
+ */
+class KotlinBuilderPoem(symbols: KotlinSymbols) : KotlinPoem(symbols) {
+
+    override val id: String = "builder"
+
+    private val builderPackageName = "${symbols.rootPackage}.builder"
+
+    // Abstract factory which can be used by DSL blocks
+    private val factoryName = "${symbols.rootId}Factory"
+    private val factoryClass = ClassName(builderPackageName, factoryName)
+    private val factory = TypeSpec.classBuilder(factoryClass).addModifiers(KModifier.ABSTRACT)
+    private val factoryParamDefault = ParameterSpec.builder("factory", factoryClass)
+        .defaultValue("%T.DEFAULT", factoryClass)
+        .build()
+
+    // Java style builders, used by the DSL
+    private val buildersName = "${symbols.rootId}Builders"
+    private val buildersFile = FileSpec.builder(builderPackageName, buildersName)
+
+    // Top-Level DSL holder, so that was close on the factory
+    private val dslName = "${symbols.rootId}Builder"
+    private val dslClass = ClassName(builderPackageName, dslName)
+    private val dslSpec = TypeSpec.classBuilder(dslClass)
+        .addProperty(
+            PropertySpec.builder("factory", factoryClass)
+                .addModifiers(KModifier.PRIVATE)
+                .initializer("factory")
+                .build()
+        )
+        .primaryConstructor(FunSpec.constructorBuilder().addParameter(factoryParamDefault).build())
+
+    // T : FooNode
+    private val boundedT = TypeVariableName("T", symbols.base)
+
+    // Static top-level entry point for DSL
+    private val dslFunc = FunSpec.builder(symbols.rootId.toCamelCase())
+        .addTypeVariable(boundedT)
+        .addParameter(factoryParamDefault)
+        .addParameter(
+            ParameterSpec.builder(
+                "block",
+                LambdaTypeName.get(
+                    receiver = dslClass,
+                    returnType = boundedT
+                )
+            ).build()
+        )
+        .addStatement("return %T(factory).block()", dslClass)
+        .build()
+
+    // Static companion object entry point for factory, similar to PIG "build"
+    private val factoryFunc = FunSpec.builder("create")
+        .addAnnotation(Annotations.jvmStatic)
+        .addTypeVariable(boundedT)
+        .addParameter(
+            ParameterSpec.builder(
+                "block",
+                LambdaTypeName.get(
+                    receiver = factoryClass,
+                    returnType = boundedT
+                )
+            ).build()
+        )
+        .addStatement("return %T.DEFAULT.block()", factoryClass)
+        .build()
+
+    override fun apply(universe: KotlinUniverseSpec) {
+        super.apply(universe)
+        universe.packages.add(
+            KotlinPackageSpec(
+                name = builderPackageName,
+                files = mutableListOf(
+                    // Factory
+                    FileSpec.builder(builderPackageName, factoryName)
+                        .addType(factory.addType(factoryCompanion()).build())
+                        .build(),
+                    // Java Builders
+                    buildersFile.build(),
+                    // DSL
+                    FileSpec.builder(builderPackageName, dslName)
+                        .addFunction(dslFunc)
+                        .addType(dslSpec.build())
+                        .build()
+                )
+            )
+        )
+    }
+
+    override fun apply(node: KotlinNodeSpec.Product) {
+        // Simple `create` functions
+        factory.addFunction(
+            FunSpec.builder(symbols.camel(node.product.ref))
+                .addModifiers(KModifier.OPEN)
+                .apply {
+                    node.props.forEach { addParameter(it.name, it.type) }
+                    addStatement("return %T(${node.props.joinToString { it.name }})", node.clazz)
+                }
+                .build()
+        )
+        // DSL Receiver and Function
+        val (builder, func) = node.builderToFunc()
+        buildersFile.addType(builder)
+        dslSpec.addFunction(func)
+        super.apply(node)
+    }
+
+    // --- Internal -------------------
+
+    /**
+     * Returns a Pair of the Java builder and the Kotlin builder receiver function
+     * This could be split for clarity, but it could be repetitive.
+     */
+    private fun KotlinNodeSpec.Product.builderToFunc(): Pair<TypeSpec, FunSpec> {
+        // Java Builder, empty constructor
+        val builderName = symbols.camel(product.ref)
+        val builderType = ClassName(builderPackageName, "${builderName.toPascalCase()}Builder")
+        val builder = TypeSpec.classBuilder(builderType)
+
+        // DSL Function
+        val funcDsl = FunSpec.builder(builderName).returns(clazz)
+        funcDsl.addStatement("val builder = %T()", builderType)
+
+        // Java builder `build(factory: Factory = DEFAULT): T`
+        val funcBuild = FunSpec.builder("build").addParameter(factoryParamDefault).returns(clazz)
+        val args = mutableListOf<String>()
+
+        companion.addFunction(
+            FunSpec.builder("builder")
+                .addAnnotation(Annotations.jvmStatic)
+                .returns(builderType)
+                .addStatement("return %T()", builderType)
+                .build()
+        )
+
+        // Add all props to Java builder, DSL function, and Factory call
+        product.props.forEachIndexed { i, it ->
+            var type = symbols.typeNameOf(it.ref, mutable = true)
+            val name = props[i].name
+            val default = when (it.ref) {
+                is TypeRef.List -> "mutableListOf()"
+                is TypeRef.Set -> "mutableSetOf()"
+                is TypeRef.Map -> "mutableMapOf()"
+                else -> {
+                    type = type.copy(nullable = true)
+                    "null"
+                }
+            }
+            // t: T = default
+            val para = ParameterSpec.builder(name, type).build()
+            funcDsl.addParameter(para.toBuilder().defaultValue(default).build())
+            // public var t: T
+            val prop = PropertySpec.builder(name, type).initializer(default).mutable().build()
+            builder.addProperty(prop)
+
+            // Fluent builder method, only setters for now, can add collection manipulation later
+            builder.addFunction(
+                FunSpec.builder(name)
+                    .returns(builderType)
+                    .addParameter(para)
+                    .beginControlFlow("return this.apply")
+                    .addStatement("this.%N = %N", para, para)
+                    .endControlFlow()
+                    .build()
+            )
+
+            // Add parameter to `build(factory: Factory =)` me
+            val assertion = if (!it.ref.nullable && default == "null") "!!" else ""
+            args += "$name = $name$assertion"
+        }
+
+        // Add block as last parameter
+        funcDsl.addParameter(
+            ParameterSpec.builder(
+                "block",
+                LambdaTypeName.get(
+                    receiver = builderType,
+                    returnType = Unit::class.asTypeName()
+                )
+            )
+                .defaultValue("{}")
+                .build()
+        )
+
+        // End of factory.foo call
+        funcBuild.addStatement("return factory.$builderName(${args.joinToString()})")
+
+        // Finalize Java builder
+        builder.addFunction(
+            FunSpec.builder("build")
+                .returns(clazz)
+                .addStatement("return build(%T.DEFAULT)", factoryClass)
+                .build()
+        )
+        builder.addFunction(funcBuild.build())
+
+        // Finalize DSL function
+        funcDsl.addStatement("builder.block()")
+        funcDsl.addStatement("return builder.build(factory)")
+
+        return Pair(builder.build(), funcDsl.build())
+    }
+
+    private fun factoryCompanion() = TypeSpec.companionObjectBuilder()
+        .addProperty(
+            PropertySpec.builder("DEFAULT", factoryClass)
+                .initializer("object : %T() {}", factoryClass)
+                .build()
+        )
+        .addFunction(factoryFunc)
+        .build()
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinJacksonPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinJacksonPoem.kt
new file mode 100644
index 0000000..8a60543
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinJacksonPoem.kt
@@ -0,0 +1,226 @@
+package org.partiql.pig.generator.target.kotlin.poems
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.NOTHING
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.STRING
+import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.TypeVariableName
+import org.partiql.pig.generator.target.kotlin.KotlinPoem
+import org.partiql.pig.generator.target.kotlin.KotlinSymbols
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinPackageSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+import org.partiql.pig.generator.target.kotlin.types.JacksonTypes
+import org.partiql.pig.generator.target.kotlin.types.Parameters
+
+/**
+ * Poem for Jackson Databind
+ */
+class KotlinJacksonPoem(symbols: KotlinSymbols) : KotlinPoem(symbols) {
+
+    override val id: String = "jackson"
+
+    private val databindPackageName = "${symbols.rootPackage}.databind"
+
+    // Consider making a separate Jackson+Builder poem; this is not an ideal solution
+    private val factoryName = ClassName("${symbols.rootPackage}.builder", "${symbols.rootId}Factory")
+
+    private val moduleName = "${symbols.rootId}Module"
+    private val moduleClass = ClassName(databindPackageName, moduleName)
+    private val module = TypeSpec.classBuilder(moduleClass)
+        .superclass(JacksonTypes.Databind.simpleModule)
+        .addProperty(
+            PropertySpec.builder("factory", factoryName)
+                .addModifiers(KModifier.PRIVATE)
+                .initializer("factory")
+                .build()
+        )
+        .primaryConstructor(
+            FunSpec.constructorBuilder()
+                .addParameter(
+                    ParameterSpec.builder("factory", factoryName)
+                        .defaultValue("%T.DEFAULT", factoryName)
+                        .build()
+                )
+                .build()
+        )
+
+    private val inheritedProps = mutableSetOf<String>()
+
+    private val mappingInterfaceName = moduleClass.nestedClass("Mapping")
+    private val mappingInterface = TypeSpec.interfaceBuilder(mappingInterfaceName)
+        .addModifiers(KModifier.PRIVATE, KModifier.FUN)
+        .addTypeVariable(TypeVariableName("T", listOf(symbols.base), KModifier.OUT))
+        .addFunction(
+            FunSpec.builder("invoke")
+                .returns(Parameters.T)
+                .addModifiers(KModifier.OPERATOR, KModifier.ABSTRACT)
+                .addParameter("node", JacksonTypes.Databind.jsonNode)
+                .build()
+        )
+        .build()
+    private val initBlock = CodeBlock.builder()
+
+    override fun apply(universe: KotlinUniverseSpec) {
+        // Jackson will serialize inherited properties; collect and ignore these before descending
+        universe.base.propertySpecs.forEach { inheritedProps.add(it.name) }
+        universe.addBaseDeserializer()
+        super.apply(universe)
+        module.addHelpers()
+        module.addInitializerBlock(initBlock.build())
+        universe.packages.add(
+            KotlinPackageSpec(
+                name = databindPackageName,
+                files = mutableListOf(
+                    FileSpec.builder(databindPackageName, moduleName)
+                        .addType(module.build())
+                        .build()
+                )
+            )
+        )
+    }
+
+    override fun apply(node: KotlinNodeSpec.Product) {
+        // --- Serialization
+
+        // Ignore all properties not in the type definition, with the caveat that the Jackson poem must be last
+        val allProps = inheritedProps + node.builder.propertySpecs.map { it.name }.toSet()
+        val definedProps = node.props.map { it.name }.toSet()
+        val extraneous = allProps - definedProps
+        if (extraneous.isNotEmpty()) {
+            node.builder.addAnnotation(JacksonTypes.Annotation.ignore(extraneous))
+        }
+        // Preserve the definition's path without a custom serializer
+        val cairn = "_id"
+        node.builder.addProperty(
+            PropertySpec.builder(cairn, STRING)
+                .addModifiers(KModifier.PRIVATE)
+                .addAnnotation(JacksonTypes.Annotation.property(cairn))
+                .initializer("%S", node.product.ref.id)
+                .build()
+        )
+        node.builder.addAnnotation(JacksonTypes.Annotation.order(cairn))
+
+        // --- Deserialization
+        node.addDeserializer {
+            val method = symbols.camel(node.product.ref)
+            addStatement("factory.$method(")
+            node.props.forEachIndexed { i, prop ->
+                val name = prop.name
+                val ref = node.product.props[i].ref
+                addStatement("$name = ${symbols.valueMapping(ref, "it[\"$name\"]")},")
+            }
+            addStatement(")")
+        }
+        super.apply(node)
+    }
+
+    override fun apply(node: KotlinNodeSpec.Sum) {
+        node.addDeserializer {
+            beginControlFlow("when (val id = it.id())")
+            node.variants.forEach {
+                addStatement("%S -> _${symbols.camel(it.def.ref)}(it)", it.def.ref.id)
+            }
+            addStatement("else -> err(id)")
+            endControlFlow()
+        }
+        super.apply(node)
+    }
+
+    private fun KotlinNodeSpec.addDeserializer(mapping: CodeBlock.Builder.() -> Unit) {
+        val method = symbols.camel(def.ref)
+        // Add node mapping function
+        module.addProperty(
+            PropertySpec.Companion.builder("_$method", mappingInterfaceName.parameterizedBy(clazz))
+                .addModifiers(KModifier.PRIVATE)
+                .initializer(
+                    CodeBlock.builder()
+                        .beginControlFlow("Mapping")
+                        .apply(mapping)
+                        .endControlFlow()
+                        .build()
+                )
+                .build()
+        )
+        // Register deserializer
+        initBlock.addStatement("addDeserializer(%T::class.java, map(_$method))", clazz)
+    }
+
+    private fun TypeSpec.Builder.addHelpers() {
+        addFunction(
+            FunSpec.builder("id")
+                .addModifiers(KModifier.PRIVATE)
+                .receiver(JacksonTypes.Databind.jsonNode)
+                .returns(STRING)
+                .addStatement("return get(%S).asText()", "_id")
+                .build()
+        )
+        addFunction(
+            FunSpec.builder("err")
+                .addModifiers(KModifier.INLINE, KModifier.PRIVATE)
+                .addParameter("id", STRING)
+                .returns(NOTHING)
+                .addStatement("return error(%P)", "no deserializer registered for _id `\$id`")
+                .build()
+        )
+
+        val deserializer = JacksonTypes.Databind.jsonDeserializer.parameterizedBy(Parameters.T)
+        addFunction(
+            FunSpec.builder("map")
+                .addModifiers(KModifier.PRIVATE)
+                .addTypeVariable(TypeVariableName("T", listOf(symbols.base)))
+                .addParameter(ParameterSpec("mapping", mappingInterfaceName.parameterizedBy(Parameters.T)))
+                .returns(deserializer)
+                .addStatement(
+                    "return %L",
+                    TypeSpec.anonymousClassBuilder()
+                        .superclass(deserializer)
+                        .addFunction(
+                            FunSpec.builder("deserialize")
+                                .addModifiers(KModifier.OVERRIDE)
+                                .addParameter("p", JacksonTypes.Core.jsonParser)
+                                .addParameter("ctxt", JacksonTypes.Databind.deserializationContext)
+                                .returns(Parameters.T)
+                                .addStatement("return mapping(ctxt.readTree(p)!!)")
+                                .build()
+                        )
+                        .build()
+                )
+                .build()
+        )
+        addType(mappingInterface)
+    }
+
+    /**
+     * Map every type definition (except enums) to its class
+     */
+    private fun KotlinUniverseSpec.addBaseDeserializer() {
+        module.addProperty(
+            PropertySpec.builder("_base", mappingInterfaceName.parameterizedBy(symbols.base))
+                .addModifiers(KModifier.PRIVATE)
+                .initializer(
+                    CodeBlock.builder()
+                        .beginControlFlow("Mapping")
+                        .beginControlFlow("when (val id = it.id())")
+                        .apply {
+                            forEachNode {
+                                addStatement("%S -> _${symbols.camel(it.def.ref)}(it)", it.def.ref.id)
+                            }
+                        }
+                        .addStatement("else -> err(id)")
+                        .endControlFlow()
+                        .endControlFlow()
+                        .build()
+                )
+                .build()
+        )
+        initBlock.addStatement("addDeserializer(%T::class.java, map(_base))", symbols.base)
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinListenerPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinListenerPoem.kt
new file mode 100644
index 0000000..fbb9d5e
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinListenerPoem.kt
@@ -0,0 +1,121 @@
+package org.partiql.pig.generator.target.kotlin.poems
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.TypeSpec
+import org.partiql.pig.generator.target.kotlin.KotlinPoem
+import org.partiql.pig.generator.target.kotlin.KotlinSymbols
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinPackageSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+
+class KotlinListenerPoem(symbols: KotlinSymbols) : KotlinPoem(symbols) {
+
+    override val id = "listener"
+
+    private val listenerPackageName = "${symbols.rootPackage}.listener"
+    private val baseListenerName = "${symbols.rootId}Listener"
+    private val baseListenerClass = ClassName(listenerPackageName, baseListenerName)
+
+    private val enter = FunSpec.builder("enter").addParameter("listener", baseListenerClass).build()
+    private val exit = FunSpec.builder("exit").addParameter("listener", baseListenerClass).build()
+
+    /**
+     * Defines the open `children` property and the abstract`accept` method on the base node
+     */
+    override fun apply(universe: KotlinUniverseSpec) {
+        universe.base.addFunction(enter.toBuilder().addModifiers(KModifier.ABSTRACT).build())
+        universe.base.addFunction(exit.toBuilder().addModifiers(KModifier.ABSTRACT).build())
+        universe.packages.add(
+            KotlinPackageSpec(
+                name = listenerPackageName,
+                files = mutableListOf(universe.listener(), walker())
+            )
+        )
+        super.apply(universe)
+    }
+
+    override fun apply(node: KotlinNodeSpec) {
+        val name = node.simpleName()
+        node.builder.addFunction(
+            enter.toBuilder()
+                .addModifiers(KModifier.OVERRIDE)
+                .addStatement("listener.enter$name(this)")
+                .build()
+        )
+        node.builder.addFunction(
+            exit.toBuilder()
+                .addModifiers(KModifier.OVERRIDE)
+                .addStatement("listener.exit$name(this)")
+                .build()
+        )
+        super.apply(node)
+    }
+
+    // --- Internal -----------------------------------
+
+    private fun KotlinUniverseSpec.listener(): FileSpec {
+        val listener = TypeSpec.classBuilder(baseListenerClass)
+            .addModifiers(KModifier.ABSTRACT)
+            .apply {
+                forEachNode {
+                    val name = it.simpleName()
+                    addFunction(
+                        FunSpec.builder("enter$name")
+                            .addModifiers(KModifier.OPEN)
+                            .addParameter("node", it.clazz)
+                            .build()
+                    )
+                    addFunction(
+                        FunSpec.builder("exit$name")
+                            .addModifiers(KModifier.OPEN)
+                            .addParameter("node", it.clazz)
+                            .build()
+                    )
+                }
+            }
+            .addFunction(
+                FunSpec.builder("enterEveryNode")
+                    .addModifiers(KModifier.OPEN)
+                    .addParameter("node", symbols.base)
+                    .build()
+            )
+            .addFunction(
+                FunSpec.builder("exitEveryNode")
+                    .addModifiers(KModifier.OPEN)
+                    .addParameter("node", symbols.base)
+                    .build()
+            )
+            .build()
+        return FileSpec.builder(listenerPackageName, baseListenerName)
+            .addType(listener)
+            .build()
+    }
+
+    private fun walker(): FileSpec {
+        val walkerName = "${symbols.rootId}Walker"
+        val walkerClass = ClassName(listenerPackageName, walkerName)
+        val walk = FunSpec.builder("walk")
+            .addParameter(ParameterSpec("listener", baseListenerClass))
+            .addParameter(ParameterSpec("node", symbols.base))
+            .apply {
+                addStatement("listener.enterEveryNode(node)")
+                addStatement("node.enter(listener)")
+                addStatement("node.children.forEach { walk(listener, it) }")
+                addStatement("node.exit(listener)")
+                addStatement("listener.exitEveryNode(node)")
+            }
+            .build()
+        val walker = TypeSpec.objectBuilder(walkerClass)
+            .addFunction(walk)
+            .build()
+        return FileSpec.builder(listenerPackageName, walkerName)
+            .addType(walker)
+            .build()
+    }
+
+    private fun KotlinNodeSpec.simpleName() = clazz.simpleNames.joinToString("")
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinMetasPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinMetasPoem.kt
new file mode 100644
index 0000000..cc60bb4
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinMetasPoem.kt
@@ -0,0 +1,25 @@
+package org.partiql.pig.generator.target.kotlin.poems
+
+import com.squareup.kotlinpoet.ANY
+import com.squareup.kotlinpoet.MUTABLE_MAP
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.STRING
+import org.partiql.pig.generator.target.kotlin.KotlinPoem
+import org.partiql.pig.generator.target.kotlin.KotlinSymbols
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+
+class KotlinMetasPoem(symbols: KotlinSymbols) : KotlinPoem(symbols) {
+
+    override val id = "metas"
+
+    // Consider a TypeAlias
+    private val stringMapOfAny = MUTABLE_MAP.parameterizedBy(STRING, ANY)
+
+    private val metas = PropertySpec.Companion.builder("metadata", stringMapOfAny).initializer("mutableMapOf()").build()
+
+    override fun apply(universe: KotlinUniverseSpec) {
+        universe.base.addProperty(metas.toBuilder().build())
+        super.apply(universe)
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinVisitorPoem.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinVisitorPoem.kt
new file mode 100644
index 0000000..54a52de
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/poems/KotlinVisitorPoem.kt
@@ -0,0 +1,247 @@
+package org.partiql.pig.generator.target.kotlin.poems
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.LIST
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeSpec
+import org.partiql.pig.generator.target.kotlin.KotlinPoem
+import org.partiql.pig.generator.target.kotlin.KotlinSymbols
+import org.partiql.pig.generator.target.kotlin.spec.KotlinNodeSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinPackageSpec
+import org.partiql.pig.generator.target.kotlin.spec.KotlinUniverseSpec
+import org.partiql.pig.generator.target.kotlin.types.Parameters
+import org.partiql.pig.model.TypeDef
+import org.partiql.pig.model.TypeRef
+
+/**
+ * Poem which makes nodes traversable via `children` and a `<Universe>Visitor`
+ */
+class KotlinVisitorPoem(symbols: KotlinSymbols) : KotlinPoem(symbols) {
+
+    override val id = "visitor"
+
+    private val children = PropertySpec.Companion.builder("children", LIST.parameterizedBy(symbols.base)).build()
+
+    private val visitorPackageName = "${symbols.rootPackage}.visitor"
+
+    // Interface visitor
+    private val visitorName = "${symbols.rootId}Visitor"
+    private val visitorClass = ClassName(visitorPackageName, visitorName).parameterizedBy(Parameters.R, Parameters.C)
+
+    // Abstract visitor with default walking
+    private val baseVisitorName = "${symbols.rootId}BaseVisitor"
+
+    private val accept = FunSpec.builder("accept")
+        .addTypeVariable(Parameters.R)
+        .addTypeVariable(Parameters.C)
+        .addParameter("visitor", visitorClass)
+        .addParameter("ctx", Parameters.C)
+        .returns(Parameters.R)
+        .build()
+
+    private val baseVisit = FunSpec.builder("visit")
+        .addParameter("node", symbols.base)
+        .addParameter("ctx", Parameters.C)
+        .returns(Parameters.R)
+        .build()
+
+    /**
+     * Defines the open `children` property and the abstract`accept` method on the base node
+     */
+    override fun apply(universe: KotlinUniverseSpec) {
+        universe.base.addProperty(
+            children.toBuilder()
+                .addModifiers(KModifier.OPEN)
+                .initializer("emptyList()")
+                .build()
+        )
+        universe.base.addFunction(
+            accept.toBuilder()
+                .addModifiers(KModifier.ABSTRACT)
+                .build()
+        )
+        universe.packages.add(
+            KotlinPackageSpec(
+                name = visitorPackageName,
+                files = universe.visitors().toMutableList()
+            )
+        )
+        super.apply(universe)
+    }
+
+    /**
+     * Overrides `children` and `accept` for this product node
+     */
+    override fun apply(node: KotlinNodeSpec.Product) {
+        val kids = node.kids()
+        if (kids != null) {
+            node.builder.addProperty(
+                children.toBuilder()
+                    .addModifiers(KModifier.OVERRIDE)
+                    .delegate(
+                        CodeBlock.builder()
+                            .beginControlFlow("lazy")
+                            .add(kids)
+                            .endControlFlow()
+                            .build()
+                    )
+                    .build()
+            )
+        }
+        node.builder.addFunction(
+            accept.toBuilder()
+                .addModifiers(KModifier.OVERRIDE)
+                .addStatement("return visitor.%L(this, ctx)", node.product.ref.visitMethodName())
+                .build()
+        )
+        super.apply(node)
+    }
+
+    /**
+     * Overrides `accept` for this sum node
+     */
+    override fun apply(node: KotlinNodeSpec.Sum) {
+        node.builder.addFunction(
+            accept.toBuilder()
+                .addModifiers(KModifier.OVERRIDE)
+                .apply {
+                    beginControlFlow("return when (this)")
+                    node.sum.variants.forEach {
+                        addStatement("is %T -> visitor.%L(this, ctx)", symbols.clazz(it.ref), it.ref.visitMethodName())
+                    }
+                    endControlFlow()
+                }
+                .build()
+        )
+        super.apply(node)
+    }
+
+    // --- Internal ----------------------------------------------------
+
+    /**
+     * Returns a CodeBlock which represents a list of all nodes
+     */
+    private fun KotlinNodeSpec.Product.kids(): CodeBlock? {
+        var n = product.props.size
+        val isNode: (ref: TypeRef) -> Boolean = { (it is TypeRef.Path) && (symbols.def(it) !is TypeDef.Enum) }
+        val block = CodeBlock.builder()
+            .addStatement("val kids = mutableListOf<%T?>()", symbols.base)
+            .apply {
+                product.props.forEachIndexed { i, prop ->
+                    val kid = prop.ref
+                    val name = props[i].name
+                    when {
+                        isNode(kid) -> addStatement("kids.add($name)")
+                        (kid is TypeRef.List && isNode(kid.type)) -> addStatement("kids.addAll($name)")
+                        (kid is TypeRef.Set && isNode(kid.type)) -> addStatement("kids.addAll($name)")
+                        else -> n -= 1
+                    }
+                }
+            }
+            .addStatement("kids.filterNotNull()")
+            .build()
+        return if (n != 0) block else null
+    }
+
+    /**
+     * Generate all visitors for this universe
+     */
+    private fun KotlinUniverseSpec.visitors(): List<FileSpec> = listOf(visitor(), baseVisitor())
+
+    /**
+     * Generates the visitor interface for this universe
+     */
+    private fun KotlinUniverseSpec.visitor(): FileSpec {
+        val visitor = TypeSpec.interfaceBuilder(visitorName)
+            .addTypeVariable(Parameters.R)
+            .addTypeVariable(Parameters.C)
+            .apply {
+                addFunction(baseVisit.toBuilder().addModifiers(KModifier.ABSTRACT).build())
+                forEachNode {
+                    val visit = it.visit().addModifiers(KModifier.ABSTRACT).build()
+                    addFunction(visit)
+                }
+            }
+            .build()
+        return FileSpec.builder(visitorPackageName, visitorName).addType(visitor).build()
+    }
+
+    /**
+     * Generates the base visitor for this universe
+     */
+    private fun KotlinUniverseSpec.baseVisitor(): FileSpec {
+        val defaultVisit = FunSpec.builder("defaultVisit")
+            .addModifiers(KModifier.OPEN)
+            .addParameter(ParameterSpec("node", symbols.base))
+            .addParameter(ParameterSpec("ctx", Parameters.C))
+            .returns(Parameters.R)
+            .beginControlFlow("for (child in node.children)")
+            .addStatement("child.accept(this, ctx)")
+            .endControlFlow()
+            .addStatement("return defaultReturn(node, ctx)")
+            .build()
+        val defaultReturn = FunSpec.builder("defaultReturn")
+            .addModifiers(KModifier.ABSTRACT)
+            .addParameter(ParameterSpec("node", symbols.base))
+            .addParameter(ParameterSpec("ctx", Parameters.C))
+            .returns(Parameters.R)
+            .build()
+        val visitor = TypeSpec.classBuilder(baseVisitorName)
+            .addSuperinterface(visitorClass)
+            .addModifiers(KModifier.ABSTRACT)
+            .addTypeVariable(Parameters.R)
+            .addTypeVariable(Parameters.C)
+            .apply {
+                addFunction(
+                    baseVisit.toBuilder()
+                        .addModifiers(KModifier.OVERRIDE)
+                        .addCode("return node.accept(this, ctx)")
+                        .build()
+                )
+                forEachNode {
+                    addFunction(it.defaultVisit())
+                }
+            }
+            .addFunction(defaultVisit)
+            .addFunction(defaultReturn)
+            .build()
+        return FileSpec.builder(visitorPackageName, baseVisitorName).addType(visitor).build()
+    }
+
+    /**
+     * Visit interface method
+     */
+    private fun KotlinNodeSpec.visit() = FunSpec.builder(def.ref.visitMethodName())
+        .addParameter(ParameterSpec("node", clazz))
+        .addParameter(ParameterSpec("ctx", Parameters.C))
+        .returns(Parameters.R)
+
+    /**
+     * Visit default method
+     */
+    private fun KotlinNodeSpec.defaultVisit() = visit()
+        .addModifiers(KModifier.OVERRIDE)
+        .apply {
+            when (this@defaultVisit) {
+                is KotlinNodeSpec.Product -> addStatement("return defaultVisit(node, ctx)")
+                is KotlinNodeSpec.Sum -> {
+                    beginControlFlow("return when (node)")
+                    sum.variants.forEach {
+                        addStatement("is %T -> %L(node, ctx)", symbols.clazz(it.ref), it.ref.visitMethodName())
+                    }
+                    endControlFlow()
+                }
+            }
+        }.build()
+
+    /**
+     * Returns the visit method name of the given TypeRef.Path
+     */
+    private fun TypeRef.Path.visitMethodName() = "visit${symbols.pascal(this)}"
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinFileSpec.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinFileSpec.kt
new file mode 100644
index 0000000..88b10f5
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinFileSpec.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.spec
+
+import java.io.IOException
+
+/**
+ * For now, this just inverts the KotlinPoet FileSpec dependency
+ */
+class KotlinFileSpec internal constructor(
+    private val file: com.squareup.kotlinpoet.FileSpec
+) {
+
+    val name: String = file.name
+
+    val packageName: String = file.packageName
+
+    @Throws(IOException::class)
+    fun writeTo(out: Appendable) {
+        file.writeTo(out)
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinNodeSpec.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinNodeSpec.kt
new file mode 100644
index 0000000..f0f20ec
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinNodeSpec.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.spec
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.TypeName
+import com.squareup.kotlinpoet.TypeSpec
+import org.partiql.pig.model.TypeDef
+
+/**
+ * Wraps a [TypeDef] with KotlinPoet builders
+ *
+ * @property def            TypeDef
+ * @property clazz          Type ClassName
+ * @property builder        Type builder
+ * @property constructor    Implementation constructor
+ * @property companion      A place for static methods on nodes
+ * @property nodes          Node types defined within this node
+ */
+sealed class KotlinNodeSpec(
+    val def: TypeDef,
+    val clazz: ClassName,
+    val builder: TypeSpec.Builder,
+    val constructor: FunSpec.Builder,
+    val companion: TypeSpec.Builder,
+    val ext: MutableList<TypeSpec> = mutableListOf()
+) {
+
+    /**
+     * Nodes defined within this node, but don't inherit from this class
+     */
+    abstract val nodes: List<KotlinNodeSpec>
+
+    /**
+     * All types defined within this node
+     */
+    abstract val children: List<KotlinNodeSpec>
+
+    /**
+     * Returns the built Pair<Base, Impl>
+     */
+    open fun build(): TypeSpec = with(builder) {
+        primaryConstructor(constructor.build())
+        ext.forEach { addType(it) }
+        children.forEach { addType(it.build()) }
+        if (companion.propertySpecs.isNotEmpty() || companion.funSpecs.isNotEmpty()) {
+            addType(companion.build())
+        }
+        build()
+    }
+
+    /**
+     * Wraps a [TypeDef.Product] with codegen builders
+     */
+    class Product(
+        val product: TypeDef.Product,
+        val props: List<Prop>,
+        override val nodes: List<KotlinNodeSpec>,
+        clazz: ClassName,
+        ext: MutableList<TypeSpec> = mutableListOf()
+    ) : KotlinNodeSpec(
+        def = product,
+        clazz = clazz,
+        builder = TypeSpec.classBuilder(clazz),
+        constructor = FunSpec.constructorBuilder(),
+        companion = TypeSpec.companionObjectBuilder(),
+        ext = ext
+    ) {
+        override val children: List<KotlinNodeSpec> = nodes
+    }
+
+    /**
+     * Wraps a [TypeDef.Sum] with a codegen builders
+     */
+    class Sum(
+        val sum: TypeDef.Sum,
+        val variants: List<KotlinNodeSpec>,
+        override val nodes: List<KotlinNodeSpec>,
+        clazz: ClassName,
+        ext: MutableList<TypeSpec> = mutableListOf()
+    ) : KotlinNodeSpec(
+        def = sum,
+        clazz = clazz,
+        builder = TypeSpec.classBuilder(clazz).addModifiers(KModifier.SEALED),
+        constructor = FunSpec.constructorBuilder(),
+        companion = TypeSpec.companionObjectBuilder(),
+        ext = ext
+    ) {
+        override val children: List<KotlinNodeSpec> = variants + nodes
+    }
+
+    /**
+     * Derived from a [TypeProp], but replaced the ref with a ClassName
+     */
+    class Prop(
+        val name: String,
+        val type: TypeName
+    )
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinPackageSpec.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinPackageSpec.kt
new file mode 100644
index 0000000..92357f4
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinPackageSpec.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.spec
+
+import com.squareup.kotlinpoet.FileSpec
+
+/**
+ * A place to define a new package within a domain or universe
+ *
+ * @property name
+ * @property files
+ */
+class KotlinPackageSpec(
+    val name: String,
+    val files: MutableList<FileSpec> = mutableListOf()
+)
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinUniverseSpec.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinUniverseSpec.kt
new file mode 100644
index 0000000..0218c48
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/spec/KotlinUniverseSpec.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.spec
+
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.TypeSpec
+import org.partiql.pig.model.Universe
+
+/**
+ * Wraps a [Universe] with KotlinPoet builders
+ *
+ * @property universe       Universe definition
+ * @property nodes          Node builders
+ * @property base           Base node builder
+ * @property packages       Additional packages to include in the universe package
+ * @property types          Additional non-node types to include in the universe package
+ * @property files          Additional files to include in the universe package
+ */
+class KotlinUniverseSpec(
+    val universe: Universe,
+    val nodes: List<KotlinNodeSpec>,
+    val base: TypeSpec.Builder,
+    val packages: MutableList<KotlinPackageSpec> = mutableListOf(),
+    val types: MutableList<TypeSpec> = mutableListOf(),
+    val files: MutableList<FileSpec> = mutableListOf()
+) {
+
+    /**
+     * Build the Kotlin files
+     *
+     * <root>
+     *  ├── Types.kt
+     *  ├── ...
+     *  ├── builder
+     *  │   └── <Universe>Builder.kt
+     *  ├── listener
+     *  │   └── <Universe>Listener.kt
+     *  └── visitor
+     *      └── <Universe>Visitor.kt
+     */
+    fun build(root: String): List<FileSpec> {
+        val files = mutableListOf<FileSpec>()
+        val nodes = nodes.map { it.build() }
+
+        // <root>/Types.kt
+        files += with(FileSpec.builder(root, "Types")) {
+            addType(base.build())
+            nodes.forEach { addType(it) }
+            types.forEach { addType(it) }
+            build()
+        }
+
+        // <root>/<ext>.kt
+        files += this.files
+        // <root>/<package>/...
+        files += packages.flatMap { it.files }
+        return files
+    }
+
+    fun forEachNode(action: (KotlinNodeSpec) -> Unit) {
+        fun List<KotlinNodeSpec>.applyToAll() {
+            forEach {
+                action(it)
+                it.children.applyToAll()
+            }
+        }
+        nodes.applyToAll()
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Annotations.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Annotations.kt
new file mode 100644
index 0000000..636ae06
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Annotations.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.types
+
+import com.squareup.kotlinpoet.AnnotationSpec
+
+object Annotations {
+
+    val jvmStatic = AnnotationSpec.builder(JvmStatic::class).build()
+
+    fun suppress(what: String) = AnnotationSpec.builder(Suppress::class).addMember("\"$what\"").build()
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/JacksonTypes.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/JacksonTypes.kt
new file mode 100644
index 0000000..1a41f9b
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/JacksonTypes.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.types
+
+import com.squareup.kotlinpoet.AnnotationSpec
+import com.squareup.kotlinpoet.ClassName
+
+object JacksonTypes {
+
+    private const val root = "com.fasterxml.jackson"
+
+    object Core {
+
+        const val packageName = "$root.core"
+
+        val jsonParser = ClassName(packageName, "JsonParser")
+    }
+
+    object Databind {
+
+        const val packageName = "$root.databind"
+
+        val objectMapper = ClassName(packageName, "ObjectMapper")
+
+        val simpleModule = ClassName("$packageName.module", "SimpleModule")
+
+        val jsonDeserializer = ClassName(packageName, "JsonDeserializer")
+
+        val jsonNode = ClassName(packageName, "JsonNode")
+
+        val deserializationContext = ClassName(packageName, "DeserializationContext")
+    }
+
+    object Annotation {
+
+        const val packageName = "$root.annotation"
+
+        val ignoreProperties = ClassName(packageName, "JsonIgnoreProperties")
+
+        val property = ClassName(packageName, "JsonProperty")
+
+        val propertyOrder = ClassName(packageName, "JsonPropertyOrder")
+
+        fun ignore(members: Iterable<String>) = AnnotationSpec.builder(ignoreProperties)
+            .addMember(members.joinToString { "\"$it\"" })
+            .build()
+
+        fun property(name: String) = AnnotationSpec.builder(property)
+            .addMember("%S", name)
+            .build()
+
+        fun order(vararg members: String) = AnnotationSpec.builder(propertyOrder)
+            .addMember(members.joinToString { "\"$it\"" })
+            .build()
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Parameters.kt b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Parameters.kt
new file mode 100644
index 0000000..961b860
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/generator/target/kotlin/types/Parameters.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.generator.target.kotlin.types
+
+import com.squareup.kotlinpoet.TypeVariableName
+
+object Parameters {
+
+    val R = TypeVariableName("R")
+
+    val C = TypeVariableName("C")
+
+    val T = TypeVariableName("T")
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/legacy/LegacyCommand.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/LegacyCommand.kt
new file mode 100644
index 0000000..8da4c77
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/LegacyCommand.kt
@@ -0,0 +1,370 @@
+package org.partiql.pig.legacy
+
+import com.amazon.ion.system.IonReaderBuilder
+import org.partiql.pig.legacy.cmdline.Command
+import org.partiql.pig.legacy.cmdline.TargetLanguage
+import org.partiql.pig.legacy.errors.PigException
+import org.partiql.pig.legacy.generator.custom.applyCustomTemplate
+import org.partiql.pig.legacy.generator.html.applyHtmlTemplate
+import org.partiql.pig.legacy.generator.ion.generateIon
+import org.partiql.pig.legacy.generator.kotlin.convertToKTypeUniverse
+import org.partiql.pig.legacy.generator.kotlin.generateKotlinCode
+import org.partiql.pig.legacy.model.TypeUniverse
+import org.partiql.pig.legacy.parser.parseTypeUniverse
+import picocli.CommandLine
+import picocli.CommandLine.Option
+import java.io.File
+import java.io.FileInputStream
+import java.io.PrintStream
+import java.io.PrintWriter
+import java.util.Optional
+import java.util.concurrent.Callable
+
+/**
+ * PIG 0.x command line.
+ *
+ * Optionals are not ideal, but are necessary coming from jopt since subcommands weren't used.
+ */
+@CommandLine.Command(
+    name = "legacy",
+    description = ["PartiQL IR Generator 0.x"],
+    mixinStandardHelpOptions = true
+)
+class LegacyCommand : Callable<Int> {
+
+    companion object {
+
+        // Previous command hack for backwards compatibility testing.
+        // Picocli parses a command for us, but we want to recreate the old jopt style here.
+        // Could be a list, but `pig` is only ever invoked once
+        internal var previous: Command? = null
+    }
+
+    @Option(
+        names = ["--capture"],
+        description = ["Parse arguments to previous command, but do not execute"]
+    )
+    var capture: Boolean = false
+
+    @Option(
+        names = ["--help", "-h", "-?"],
+        description = ["Prints current version"]
+    )
+    var help: Boolean = false
+
+    @Option(
+        names = ["--version", "-v"],
+        description = ["Prints current version"]
+    )
+    var version: Boolean = false
+
+    @Option(
+        names = ["--universe", "-u"],
+        description = ["Type universe input file"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var universe: Optional<File>
+
+    @Option(
+        names = ["--target", "-t"],
+        description = ["Type universe input file"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var target: Optional<LanguageTargetType>
+
+    @Option(
+        names = ["--output-file", "-o"],
+        description = ["Generated source output file"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var outputFile: Optional<File>
+
+    @Option(
+        names = ["--output-directory", "-d"],
+        description = ["Generated source output directory"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var outputDirectory: Optional<File>
+
+    @Option(
+        names = ["--namespace", "-n"],
+        description = ["Namespace for generated code"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var namespace: Optional<String>
+
+    @Option(
+        names = ["--template", "-e"],
+        description = ["Path to an Apache FreeMarker template"],
+        defaultValue = Option.NULL_VALUE
+    )
+    lateinit var template: Optional<File>
+
+    @Option(
+        names = ["--domains", "-f"],
+        split = ",",
+        description = ["List of domains to generate (comma separated)"]
+    )
+    var domains: List<String> = emptyList()
+
+    override fun call(): Int {
+        val command = parse()
+        // short-circuit on capture
+        if (capture) {
+            previous = command
+            return 0
+        }
+        // execute, legacy main.kt
+        when (command) {
+            is Command.ShowHelp -> printHelp(System.out)
+            is Command.ShowVersion -> println("PartiQL IR Generator 0.X")
+            is Command.InvalidCommandLineArguments -> {
+                System.err.println(command.message)
+                return -1
+            }
+            is Command.Generate -> {
+                try {
+                    generateCode(command)
+                } catch (e: PigException) {
+                    System.err.println("pig: ${e.error.location}: ${e.error.context.message}\n${e.stackTrace}")
+                    return -1
+                }
+            }
+        }
+        return 0
+    }
+
+    /**
+     * Prints help to the specified [PrintStream].
+     */
+    private fun printHelp(out: PrintStream) {
+        CommandLine.usage(this, out)
+        out.println(
+            """|Each target requires certain arguments:
+        |
+        |   --target=kotlin requires --namespace=<ns> and --output-directory=<out-dir>
+        |   --target=custom requires --template=<path-to-template> and --output-file=<generated-file>
+        |   --target=html   requires --output-file=<output-html-file>
+        |   --target=ion    requires --output-file=<output-ion-file>
+        |
+        |Notes:
+        |
+        |   If -d or --output-directory is specified and the directory does not exist, it will be created.
+        |
+        |Examples:
+        |
+        |  pig --target=kotlin \
+        |      --universe=universe.ion \
+        |      --output-directory=generated-src \
+        |      --namespace=org.example.domain
+        |
+        |  pig --target=custom \
+        |      --universe=universe.ion \
+        |      --output-file=example.txt \
+        |      --template=template.ftl
+        |
+        |  pig --target=ion \
+        |      --universe=universe.ion \
+        |      --output-file=example.ion
+        |
+            """.trimMargin()
+        )
+    }
+
+    private fun parse(): Command {
+        return try {
+            when {
+                help -> Command.ShowHelp
+                version -> Command.ShowVersion
+                else -> {
+                    if (!universe.isPresent) {
+                        return Command.InvalidCommandLineArguments("Missing required option(s) [u/universe]")
+                    }
+                    val typeUniverseFile: File = universe.get()
+
+                    if (!target.isPresent) {
+                        return Command.InvalidCommandLineArguments("Missing required option(s) [t/target]")
+                    }
+                    val targetType = target.get()
+
+                    // --namespace
+                    if (targetType.requireNamespace) {
+                        if (!namespace.isPresent) {
+                            return Command.InvalidCommandLineArguments(
+                                "The selected language target $targetType requires the --namespace argument"
+                            )
+                        }
+                    } else if (namespace.isPresent) {
+                        return Command.InvalidCommandLineArguments(
+                            "The selected language target $targetType does not allow the --namespace argument"
+                        )
+                    }
+
+                    // --output-file
+                    if (targetType.requireOutputFile) {
+                        if (!outputFile.isPresent) {
+                            return Command.InvalidCommandLineArguments(
+                                "The selected language target $targetType requires the --output-file argument"
+                            )
+                        }
+                    } else if (outputFile.isPresent) {
+                        return Command.InvalidCommandLineArguments(
+                            "The selected language target $targetType does not allow the --output-file argument"
+                        )
+                    }
+
+                    // --output-directory
+                    if (targetType.requireOutputDirectory) {
+                        if (!outputDirectory.isPresent) {
+                            return Command.InvalidCommandLineArguments(
+                                "The selected language target $targetType requires the --output-directory argument"
+                            )
+                        }
+                    } else if (outputDirectory.isPresent) {
+                        return Command.InvalidCommandLineArguments(
+                            "The selected language target $targetType does not allow the --output-directory argument"
+                        )
+                    }
+
+                    // --template
+                    if (targetType.requireTemplateFile) {
+                        if (!template.isPresent) {
+                            return Command.InvalidCommandLineArguments("The selected language target $targetType requires the --template argument")
+                        }
+                    } else if (template.isPresent) {
+                        return Command.InvalidCommandLineArguments(
+                            "The selected language target $targetType does not allow the --template argument"
+                        )
+                    }
+
+                    val domainSet: Set<String>? = when (domains.isNotEmpty()) {
+                        true -> domains.toSet()
+                        false -> null
+                    }
+
+                    val target = when (targetType) {
+                        LanguageTargetType.HTML -> TargetLanguage.Html(
+                            outputFile = outputFile.get(),
+                            domains = domainSet
+                        )
+                        LanguageTargetType.KOTLIN -> TargetLanguage.Kotlin(
+                            namespace = namespace.get(),
+                            outputDirectory = outputDirectory.get(),
+                            domains = domainSet
+                        )
+                        LanguageTargetType.CUSTOM -> TargetLanguage.Custom(
+                            templateFile = template.get(),
+                            outputFile = outputFile.get(),
+                            domains = domainSet
+                        )
+                        LanguageTargetType.ION -> TargetLanguage.Ion(
+                            outputFile = outputFile.get(),
+                            domains = domainSet
+                        )
+                    }
+
+                    Command.Generate(typeUniverseFile, target)
+                }
+            }
+        } catch (ex: NoSuchElementException) {
+            return Command.InvalidCommandLineArguments(ex.message!!)
+        }
+    }
+
+    enum class LanguageTargetType(
+        val requireNamespace: Boolean,
+        val requireTemplateFile: Boolean,
+        val requireOutputFile: Boolean,
+        val requireOutputDirectory: Boolean
+    ) {
+        KOTLIN(
+            requireNamespace = true,
+            requireTemplateFile = false,
+            requireOutputFile = false,
+            requireOutputDirectory = true
+        ),
+        CUSTOM(
+            requireNamespace = false,
+            requireTemplateFile = true,
+            requireOutputFile = true,
+            requireOutputDirectory = false
+        ),
+        HTML(
+            requireNamespace = false,
+            requireTemplateFile = false,
+            requireOutputFile = true,
+            requireOutputDirectory = false
+        ),
+        ION(
+            requireNamespace = false,
+            requireTemplateFile = false,
+            requireOutputFile = true,
+            requireOutputDirectory = false
+        )
+    }
+}
+
+private fun progress(msg: String) = println("pig: $msg")
+
+/**
+ * Gradle projects such as the PartiQL reference implementation take a dependency on this project
+ * in their `buildSrc` directory and can then use this entry point to generate code direclty without
+ * having to `exec` pig as a separate process.
+ */
+fun generateCode(command: Command.Generate) {
+    progress("universe file: ${command.typeUniverseFile}")
+
+    progress("parsing the universe...")
+    val typeUniverse: TypeUniverse = FileInputStream(command.typeUniverseFile).use { inputStream ->
+        IonReaderBuilder.standard().build(inputStream).use { ionReader -> parseTypeUniverse(ionReader) }
+    }
+
+    progress("permuting domains...")
+
+    val computedDomains = typeUniverse.computeTypeDomains()
+    val filteredDomains =
+        command.target.domains?.let { computedDomains.filter { domain -> domain.tag in it } } ?: computedDomains
+
+    when (command.target) {
+        is TargetLanguage.Kotlin -> {
+            progress("applying Kotlin pre-processing")
+            val kotlinTypeUniverse = typeUniverse.convertToKTypeUniverse(computedDomains, filteredDomains, command.target.domains)
+            val dir = command.target.outputDirectory
+            if (dir.exists()) {
+                if (!dir.isDirectory) {
+                    error("The path specified as the output directory exists but is not a directory.")
+                }
+            } else {
+                dir.mkdirs()
+            }
+            progress("applying the Kotlin template once for each domain...")
+            generateKotlinCode(command.target.namespace, kotlinTypeUniverse, command.target.outputDirectory)
+        }
+        is TargetLanguage.Custom -> {
+            progress("output file  : ${command.target.outputFile}")
+            progress("applying ${command.target.templateFile}")
+
+            PrintWriter(command.target.outputFile).use { printWriter ->
+                applyCustomTemplate(command.target.templateFile, filteredDomains, printWriter)
+            }
+        }
+        is TargetLanguage.Html -> {
+            progress("output file  : ${command.target.outputFile}")
+            progress("applying the HTML template")
+
+            PrintWriter(command.target.outputFile).use { printWriter ->
+                applyHtmlTemplate(filteredDomains, printWriter)
+            }
+        }
+        is TargetLanguage.Ion -> {
+            progress("output file  : ${command.target.outputFile}")
+            progress("applying the Ion template")
+
+            PrintWriter(command.target.outputFile).use { printWriter ->
+                generateIon(filteredDomains, printWriter)
+            }
+        }
+    }
+
+    progress("universe generation complete!")
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/Utils.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/Utils.kt
similarity index 88%
rename from pig/src/main/kotlin/org/partiql/pig/domain/Utils.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/Utils.kt
index c02e118..b2afbd5 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/Utils.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/Utils.kt
@@ -1,17 +1,17 @@
-package org.partiql.pig.domain
+package org.partiql.pig.legacy
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.ionSexpOf
 import com.amazon.ionelement.api.ionSymbol
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.NamedElement
-import org.partiql.pig.domain.model.PermutedDomain
-import org.partiql.pig.domain.model.PermutedSum
-import org.partiql.pig.domain.model.Statement
-import org.partiql.pig.domain.model.Transform
-import org.partiql.pig.domain.model.TupleType
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.domain.model.TypeUniverse
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.NamedElement
+import org.partiql.pig.legacy.model.PermutedDomain
+import org.partiql.pig.legacy.model.PermutedSum
+import org.partiql.pig.legacy.model.Statement
+import org.partiql.pig.legacy.model.Transform
+import org.partiql.pig.legacy.model.TupleType
+import org.partiql.pig.legacy.model.TypeDomain
+import org.partiql.pig.legacy.model.TypeUniverse
 
 /*
  * The [toIonElement] functions below generate an s-expression representation of a [TypeUniverse].
diff --git a/pig/src/main/kotlin/org/partiql/pig/cmdline/Command.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/Command.kt
similarity index 95%
rename from pig/src/main/kotlin/org/partiql/pig/cmdline/Command.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/Command.kt
index befbc71..72643c1 100644
--- a/pig/src/main/kotlin/org/partiql/pig/cmdline/Command.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/Command.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.cmdline
+package org.partiql.pig.legacy.cmdline
 
 import java.io.File
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/cmdline/TargetLanguage.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/TargetLanguage.kt
similarity index 96%
rename from pig/src/main/kotlin/org/partiql/pig/cmdline/TargetLanguage.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/TargetLanguage.kt
index d1efa8a..04a6fc2 100644
--- a/pig/src/main/kotlin/org/partiql/pig/cmdline/TargetLanguage.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/cmdline/TargetLanguage.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.cmdline
+package org.partiql.pig.legacy.cmdline
 
 import java.io.File
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/FreeMarkerUtils.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/FreeMarkerUtils.kt
similarity index 93%
rename from pig/src/main/kotlin/org/partiql/pig/generator/FreeMarkerUtils.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/FreeMarkerUtils.kt
index 6f91247..f6fa291 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/FreeMarkerUtils.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/FreeMarkerUtils.kt
@@ -13,15 +13,15 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator
+package org.partiql.pig.legacy.generator
 
 import freemarker.template.Configuration
 import freemarker.template.TemplateExceptionHandler
 import freemarker.template.TemplateMethodModelEx
 import freemarker.template.TemplateModelException
-import org.partiql.pig.generator.kotlin.KotlinDomainFreeMarkerGlobals
-import org.partiql.pig.util.snakeToCamelCase
-import org.partiql.pig.util.snakeToPascalCase
+import org.partiql.pig.legacy.generator.kotlin.KotlinDomainFreeMarkerGlobals
+import org.partiql.pig.legacy.util.snakeToCamelCase
+import org.partiql.pig.legacy.util.snakeToPascalCase
 
 /**
  * When applying a template for a pre-packaged language target such as Kotlin, we
@@ -33,7 +33,7 @@ internal fun Configuration.setClassLoaderForTemplates() {
     // the classloader of [TopLevelFreeMarkerGlobals] and set the root package.
     this.setClassLoaderForTemplateLoading(
         KotlinDomainFreeMarkerGlobals::class.java.classLoader,
-        "/org/partiql/pig/templates"
+        "/org/partiql/pig/legacy/templates"
     )
 }
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/IndentDirective.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/IndentDirective.kt
similarity index 98%
rename from pig/src/main/kotlin/org/partiql/pig/generator/IndentDirective.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/IndentDirective.kt
index 7617a78..d5504bf 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/IndentDirective.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/IndentDirective.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator
+package org.partiql.pig.legacy.generator
 
 import freemarker.core.Environment
 import freemarker.template.TemplateDirectiveBody
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/custom/CTypeDomain.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CTypeDomain.kt
similarity index 91%
rename from pig/src/main/kotlin/org/partiql/pig/generator/custom/CTypeDomain.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CTypeDomain.kt
index bf543da..3475951 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/custom/CTypeDomain.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CTypeDomain.kt
@@ -13,13 +13,13 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.custom
+package org.partiql.pig.legacy.generator.custom
 
-import org.partiql.pig.domain.model.Arity
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.NamedElement
-import org.partiql.pig.domain.model.TupleType
-import org.partiql.pig.domain.model.TypeDomain
+import org.partiql.pig.legacy.model.Arity
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.NamedElement
+import org.partiql.pig.legacy.model.TupleType
+import org.partiql.pig.legacy.model.TypeDomain
 
 //
 // Types in this file are exposed to FreeMarker templates at run-time.
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/custom/CustomFreeMarkerGlobals.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CustomFreeMarkerGlobals.kt
similarity index 94%
rename from pig/src/main/kotlin/org/partiql/pig/generator/custom/CustomFreeMarkerGlobals.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CustomFreeMarkerGlobals.kt
index 4bcb38b..0290679 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/custom/CustomFreeMarkerGlobals.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/CustomFreeMarkerGlobals.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.custom
+package org.partiql.pig.legacy.generator.custom
 
 import java.time.OffsetDateTime
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/custom/generator.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/Generator.kt
similarity index 88%
rename from pig/src/main/kotlin/org/partiql/pig/generator/custom/generator.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/Generator.kt
index 506d444..d76282c 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/custom/generator.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/custom/Generator.kt
@@ -13,10 +13,10 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.custom
+package org.partiql.pig.legacy.generator.custom
 
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.generator.createDefaultFreeMarkerConfiguration
+import org.partiql.pig.legacy.generator.createDefaultFreeMarkerConfiguration
+import org.partiql.pig.legacy.model.TypeDomain
 import java.io.File
 import java.io.PrintWriter
 import java.time.OffsetDateTime
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/html/generator.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/html/Generator.kt
similarity index 77%
rename from pig/src/main/kotlin/org/partiql/pig/generator/html/generator.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/html/Generator.kt
index 8a2a84f..166f633 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/html/generator.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/html/Generator.kt
@@ -13,13 +13,13 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.html
+package org.partiql.pig.legacy.generator.html
 
 import freemarker.template.Template
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.generator.createDefaultFreeMarkerConfiguration
-import org.partiql.pig.generator.custom.createCustomFreeMarkerGlobals
-import org.partiql.pig.generator.setClassLoaderForTemplates
+import org.partiql.pig.legacy.generator.createDefaultFreeMarkerConfiguration
+import org.partiql.pig.legacy.generator.custom.createCustomFreeMarkerGlobals
+import org.partiql.pig.legacy.generator.setClassLoaderForTemplates
+import org.partiql.pig.legacy.model.TypeDomain
 import java.io.PrintWriter
 
 fun applyHtmlTemplate(
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/ion/generator.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/ion/Generator.kt
similarity index 64%
rename from pig/src/main/kotlin/org/partiql/pig/generator/ion/generator.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/ion/Generator.kt
index b144094..c728ba8 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/ion/generator.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/ion/Generator.kt
@@ -1,7 +1,7 @@
-package org.partiql.pig.generator.ion
+package org.partiql.pig.legacy.generator.ion
 
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.domain.toIonElement
+import org.partiql.pig.legacy.model.TypeDomain
+import org.partiql.pig.legacy.toIonElement
 import java.io.PrintWriter
 
 /**
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/generator.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/Generator.kt
similarity index 94%
rename from pig/src/main/kotlin/org/partiql/pig/generator/kotlin/generator.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/Generator.kt
index d2ac1bc..2ad3f48 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/generator.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/Generator.kt
@@ -13,11 +13,11 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.kotlin
+package org.partiql.pig.legacy.generator.kotlin
 
 import freemarker.template.Configuration
-import org.partiql.pig.generator.createDefaultFreeMarkerConfiguration
-import org.partiql.pig.generator.setClassLoaderForTemplates
+import org.partiql.pig.legacy.generator.createDefaultFreeMarkerConfiguration
+import org.partiql.pig.legacy.generator.setClassLoaderForTemplates
 import java.io.File
 import java.io.PrintWriter
 import java.time.OffsetDateTime
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomain.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomain.kt
similarity index 97%
rename from pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomain.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomain.kt
index 9f2d3c0..9b005ac 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomain.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomain.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.kotlin
+package org.partiql.pig.legacy.generator.kotlin
 
 /*
   Note a big design consideration for the classes in this file is that they are easy to consume by the
@@ -96,7 +96,7 @@ data class KTuple(
      */
     val isTransformAbstract: Boolean,
     val hasVariadicElement: Boolean,
-    val annotations: List<String>,
+    val annotations: List<String>
 )
 
 data class KSum(
@@ -109,5 +109,5 @@ data class KSum(
      * generated visitor transform `transform*` method will be `abstract`.
      */
     val isTransformAbstract: Boolean,
-    val annotations: List<String>,
+    val annotations: List<String>
 )
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverter.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverter.kt
similarity index 96%
rename from pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverter.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverter.kt
index 2cc962f..eba5130 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverter.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverter.kt
@@ -19,19 +19,19 @@
  * Note that this file should not be throwing any exceptions of any kind.  Any error conditions should be
  * detected by [TypeDomain]'s error checking.
  */
-package org.partiql.pig.generator.kotlin
-
-import org.partiql.pig.domain.model.Arity
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.NamedElement
-import org.partiql.pig.domain.model.Transform
-import org.partiql.pig.domain.model.TupleType
-import org.partiql.pig.domain.model.TypeAnnotation
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.domain.model.TypeRef
-import org.partiql.pig.domain.model.TypeUniverse
-import org.partiql.pig.util.snakeToCamelCase
-import org.partiql.pig.util.snakeToPascalCase
+package org.partiql.pig.legacy.generator.kotlin
+
+import org.partiql.pig.legacy.model.Arity
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.NamedElement
+import org.partiql.pig.legacy.model.Transform
+import org.partiql.pig.legacy.model.TupleType
+import org.partiql.pig.legacy.model.TypeAnnotation
+import org.partiql.pig.legacy.model.TypeDomain
+import org.partiql.pig.legacy.model.TypeRef
+import org.partiql.pig.legacy.model.TypeUniverse
+import org.partiql.pig.legacy.util.snakeToCamelCase
+import org.partiql.pig.legacy.util.snakeToPascalCase
 
 /**
  * Turns a [TypeUniverse] into a [KTypeUniverse].  If only a subset of domains is requested via the [domainFilters], only those will be present in the output [KTypeUniverse]
@@ -177,7 +177,6 @@ private class KTypeDomainConverter(
         tuple: DataType.UserType.Tuple,
         useKotlinPrimitives: Boolean
     ): KBuilderFunction {
-
         return KBuilderFunction(
             kotlinName = tuple.tag.snakeToCamelCase() + if (!useKotlinPrimitives) "_" else "",
             parameters = tuple.namedElements
@@ -412,9 +411,9 @@ private class KTypeDomainConverter(
     private fun TypeRef.getBaseKotlinTypeName(kotlinPrimitives: Boolean, useAnyElement: Boolean = true): String {
         return when (typeName) {
             "ion" -> "com.amazon.ionelement.api." + if (useAnyElement) "AnyElement" else "IonElement"
-            "int" -> if (kotlinPrimitives) "Long" else "org.partiql.pig.runtime.LongPrimitive"
-            "bool" -> if (kotlinPrimitives) "Boolean" else "org.partiql.pig.runtime.BoolPrimitive"
-            "symbol" -> if (kotlinPrimitives) "String" else "org.partiql.pig.runtime.SymbolPrimitive"
+            "int" -> if (kotlinPrimitives) "Long" else "org.partiql.pig.legacy.runtime.LongPrimitive"
+            "bool" -> if (kotlinPrimitives) "Boolean" else "org.partiql.pig.legacy.runtime.BoolPrimitive"
+            "symbol" -> if (kotlinPrimitives) "String" else "org.partiql.pig.legacy.runtime.SymbolPrimitive"
             else -> this.typeName.snakeToPascalCase()
         }
     }
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt
similarity index 88%
rename from pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt
index 8ff4497..8ae448e 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinCrossDomainFreeMarkerGlobals.kt
@@ -1,4 +1,4 @@
-package org.partiql.pig.generator.kotlin
+package org.partiql.pig.legacy.generator.kotlin
 
 import java.time.OffsetDateTime
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt
similarity index 95%
rename from pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt
index 11b2c72..7fbbbbb 100644
--- a/pig/src/main/kotlin/org/partiql/pig/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/generator/kotlin/KotlinDomainFreeMarkerGlobals.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.kotlin
+package org.partiql.pig.legacy.generator.kotlin
 
 import java.time.OffsetDateTime
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/Arity.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/Arity.kt
similarity index 95%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/Arity.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/Arity.kt
index 08bbe4a..6a24575 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/Arity.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/Arity.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 /** Base class representing an element's arity. */
 sealed class Arity {
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/DataType.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/DataType.kt
similarity index 97%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/DataType.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/DataType.kt
index f40d964..9f86fae 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/DataType.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/DataType.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.emptyMetaContainer
@@ -154,9 +154,8 @@ sealed class DataType {
                 if (tag != other.tag) return false
                 if (tupleType != other.tupleType) return false
                 if (namedElements != other.namedElements) return false
-                if (isDifferent != other.isDifferent) return false
+                return isDifferent == other.isDifferent
                 // Metas intentionally omitted here
-                return true
             }
 
             override fun hashCode(): kotlin.Int {
@@ -191,10 +190,8 @@ sealed class DataType {
 
                 if (tag != other.tag) return false
                 if (variants != other.variants) return false
-                if (isDifferent != other.isDifferent) return false
+                return isDifferent == other.isDifferent
                 // Metas intentionally omitted here
-
-                return true
             }
 
             override fun hashCode(): kotlin.Int {
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/NamedElement.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/NamedElement.kt
similarity index 92%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/NamedElement.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/NamedElement.kt
index d614762..16a2014 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/NamedElement.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/NamedElement.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 import com.amazon.ionelement.api.MetaContainer
 
@@ -33,10 +33,8 @@ data class NamedElement(
 
         if (identifier != other.identifier) return false
         if (tag != other.tag) return false
-        if (typeReference != other.typeReference) return false
+        return typeReference == other.typeReference
         // Metas intentionally omitted here
-
-        return true
     }
 
     override fun hashCode(): Int {
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/SemanticErrorContext.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/SemanticErrorContext.kt
similarity index 96%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/SemanticErrorContext.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/SemanticErrorContext.kt
index 543c09c..b47b34b 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/SemanticErrorContext.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/SemanticErrorContext.kt
@@ -13,14 +13,14 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 import com.amazon.ionelement.api.IonLocation
 import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.location
-import org.partiql.pig.errors.ErrorContext
-import org.partiql.pig.errors.PigError
-import org.partiql.pig.errors.PigException
+import org.partiql.pig.legacy.errors.ErrorContext
+import org.partiql.pig.legacy.errors.PigError
+import org.partiql.pig.legacy.errors.PigException
 
 /**
  * Encapsulates all error context information in an easily testable way.
@@ -110,6 +110,7 @@ sealed class SemanticErrorContext(val msgFormatter: () -> String) : ErrorContext
  */
 fun semanticError(blame: MetaContainer, context: ErrorContext): Nothing =
     semanticError(blame.location, context)
+
 /**
  * Shortcut for throwing [PigException] with the specified metas and [PigError].
  */
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/Statement.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/Statement.kt
similarity index 95%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/Statement.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/Statement.kt
index e686d3c..057a06b 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/Statement.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/Statement.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.emptyMetaContainer
@@ -61,7 +61,6 @@ class TypeDomain(
      * data types.
      */
     fun computeTransform(destination: TypeDomain): TypeDomain {
-
         val destUserTypes = destination.userTypes
 
         val transformedTypes = userTypes
@@ -106,10 +105,8 @@ class TypeDomain(
 
         if (tag != other.tag) return false
         if (userTypes != other.userTypes) return false
-        if (types != other.types) return false
+        return types == other.types
         // Metas intentionally omitted here
-
-        return true
     }
 
     override fun hashCode(): Int {
@@ -202,12 +199,14 @@ data class PermutedDomain(
                         metas = metas
                     )
 
-                    if (!newTypes.remove(typeToAlter))
-                    // If this happens it's a bug
+                    if (!newTypes.remove(typeToAlter)) {
+                        // If this happens it's a bug
                         error("Failed to remove altered type '${typeToAlter.tag}' for some reason")
+                    }
 
                     newTypes.add(newSumType)
                 }
+                else -> {}
             }
         }
 
@@ -225,10 +224,8 @@ data class PermutedDomain(
         if (permutesDomain != other.permutesDomain) return false
         if (excludedTypes != other.excludedTypes) return false
         if (includedTypes != other.includedTypes) return false
-        if (permutedSums != other.permutedSums) return false
+        return permutedSums == other.permutedSums
         // Metas intentionally omitted here
-
-        return true
     }
 
     override fun hashCode(): Int {
@@ -256,10 +253,8 @@ data class PermutedSum(
 
         if (tag != other.tag) return false
         if (removedVariants != other.removedVariants) return false
-        if (addedVariants != other.addedVariants) return false
+        return addedVariants == other.addedVariants
         // Metas intentionally omitted here
-
-        return true
     }
 
     override fun hashCode(): Int {
@@ -286,9 +281,7 @@ data class Transform(
         if (other !is Transform) return false
 
         if (sourceDomainTag != other.sourceDomainTag) return false
-        if (destinationDomainTag != other.destinationDomainTag) return false
-
-        return true
+        return destinationDomainTag == other.destinationDomainTag
     }
 
     override fun hashCode(): Int {
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/TupleType.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TupleType.kt
similarity index 93%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/TupleType.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/TupleType.kt
index eeb3a1a..45f5521 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/TupleType.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TupleType.kt
@@ -13,10 +13,10 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 /** Indicates the type of tuple. */
 enum class TupleType {
     PRODUCT,
-    RECORD,
+    RECORD
 }
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeAnnotation.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeAnnotation.kt
similarity index 95%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/TypeAnnotation.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeAnnotation.kt
index f32fdde..fc4ea33 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeAnnotation.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeAnnotation.kt
@@ -1,4 +1,4 @@
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 /**
  * Annotations that are allowed on a UserType definition
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeDomainSemanticChecker.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeDomainSemanticChecker.kt
similarity index 99%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/TypeDomainSemanticChecker.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeDomainSemanticChecker.kt
index ae7b6ad..27d91b9 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeDomainSemanticChecker.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeDomainSemanticChecker.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 /**
  * Performs semantic checking for [TypeDomain].
@@ -221,7 +221,8 @@ private class TypeDomainSemanticChecker(private val typeDomain: TypeDomain) {
     private fun checkProductIonFieldArity(p: DataType.UserType.Tuple) =
         p.namedElements.forEach { element ->
             val dataType = typeDomain.resolveTypeRef(element.typeReference)
-            if (dataType == DataType.Ion && element.typeReference.arity == Arity.Optional)
+            if (dataType == DataType.Ion && element.typeReference.arity == Arity.Optional) {
                 semanticError(element.metas, SemanticErrorContext.OptionalIonTypeElement)
+            }
         }
 }
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeRef.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeRef.kt
similarity index 94%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/TypeRef.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeRef.kt
index f4987cd..08533ca 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeRef.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeRef.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.MetaContainer
@@ -40,10 +40,8 @@ data class TypeRef(val typeName: String, val arity: Arity, val metas: MetaContai
         if (other !is TypeRef) return false
 
         if (typeName != other.typeName) return false
-        if (arity != other.arity) return false
+        return arity == other.arity
         // Metas intentionally omitted here
-
-        return true
     }
 
     override fun hashCode(): Int {
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeUniverse.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeUniverse.kt
similarity index 96%
rename from pig/src/main/kotlin/org/partiql/pig/domain/model/TypeUniverse.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeUniverse.kt
index 7d8721f..79e3e0c 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/model/TypeUniverse.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/model/TypeUniverse.kt
@@ -13,9 +13,9 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.model
+package org.partiql.pig.legacy.model
 
-import org.partiql.pig.errors.PigException
+import org.partiql.pig.legacy.errors.PigException
 
 data class TypeUniverse(val statements: List<Statement>) {
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/parser/ParserErrorContext.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/parser/ParserErrorContext.kt
similarity index 94%
rename from pig/src/main/kotlin/org/partiql/pig/domain/parser/ParserErrorContext.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/parser/ParserErrorContext.kt
index a3cf009..4907027 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/parser/ParserErrorContext.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/parser/ParserErrorContext.kt
@@ -13,17 +13,17 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.parser
+package org.partiql.pig.legacy.parser
 
 import com.amazon.ionelement.api.ElementType
 import com.amazon.ionelement.api.IonElement
 import com.amazon.ionelement.api.IonElementException
 import com.amazon.ionelement.api.IonLocation
 import com.amazon.ionelement.api.location
-import org.partiql.pig.domain.model.TypeAnnotation
-import org.partiql.pig.errors.ErrorContext
-import org.partiql.pig.errors.PigError
-import org.partiql.pig.errors.PigException
+import org.partiql.pig.legacy.errors.ErrorContext
+import org.partiql.pig.legacy.errors.PigError
+import org.partiql.pig.legacy.errors.PigException
+import org.partiql.pig.legacy.model.TypeAnnotation
 
 /**
  * Variants of [ParserErrorContext] contain details about various parse errors that can be encountered
diff --git a/pig/src/main/kotlin/org/partiql/pig/domain/parser/TypeDomainParser.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/parser/TypeDomainParser.kt
similarity index 93%
rename from pig/src/main/kotlin/org/partiql/pig/domain/parser/TypeDomainParser.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/parser/TypeDomainParser.kt
index 4f7d031..54377e1 100644
--- a/pig/src/main/kotlin/org/partiql/pig/domain/parser/TypeDomainParser.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/parser/TypeDomainParser.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain.parser
+package org.partiql.pig.legacy.parser
 
 import com.amazon.ion.IonReader
 import com.amazon.ion.system.IonReaderBuilder
@@ -25,21 +25,21 @@ import com.amazon.ionelement.api.MetaContainer
 import com.amazon.ionelement.api.SexpElement
 import com.amazon.ionelement.api.SymbolElement
 import com.amazon.ionelement.api.createIonElementLoader
-import org.partiql.pig.domain.model.Arity
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.NamedElement
-import org.partiql.pig.domain.model.PermutedDomain
-import org.partiql.pig.domain.model.PermutedSum
-import org.partiql.pig.domain.model.Statement
-import org.partiql.pig.domain.model.Transform
-import org.partiql.pig.domain.model.TupleType
-import org.partiql.pig.domain.model.TypeAnnotation
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.domain.model.TypeRef
-import org.partiql.pig.domain.model.TypeUniverse
-import org.partiql.pig.util.head
-import org.partiql.pig.util.tag
-import org.partiql.pig.util.tail
+import org.partiql.pig.legacy.model.Arity
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.NamedElement
+import org.partiql.pig.legacy.model.PermutedDomain
+import org.partiql.pig.legacy.model.PermutedSum
+import org.partiql.pig.legacy.model.Statement
+import org.partiql.pig.legacy.model.Transform
+import org.partiql.pig.legacy.model.TupleType
+import org.partiql.pig.legacy.model.TypeAnnotation
+import org.partiql.pig.legacy.model.TypeDomain
+import org.partiql.pig.legacy.model.TypeRef
+import org.partiql.pig.legacy.model.TypeUniverse
+import org.partiql.pig.legacy.util.head
+import org.partiql.pig.legacy.util.tag
+import org.partiql.pig.legacy.util.tail
 
 /** Parses a type universe contained in [universeText]. */
 fun parseTypeUniverse(universeText: String) =
@@ -129,7 +129,7 @@ private fun parseDomainLevelStatement(sexp: SexpElement): DataType.UserType {
 private fun parseVariant(
     bodyArguments: List<AnyElement>,
     metas: MetaContainer,
-    annotations: List<TypeAnnotation>,
+    annotations: List<TypeAnnotation>
 ): DataType.UserType.Tuple {
     val elements = bodyArguments.tail
 
diff --git a/pig/src/main/kotlin/org/partiql/pig/util/Capitalizers.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/util/Capitalizers.kt
similarity index 96%
rename from pig/src/main/kotlin/org/partiql/pig/util/Capitalizers.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/util/Capitalizers.kt
index ba6503b..0721f8d 100644
--- a/pig/src/main/kotlin/org/partiql/pig/util/Capitalizers.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/util/Capitalizers.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.util
+package org.partiql.pig.legacy.util
 
 fun String.snakeToPascalCase(): String =
     this.split('_')
diff --git a/pig/src/main/kotlin/org/partiql/pig/util/IonElement.kt b/pig/src/main/kotlin/org/partiql/pig/legacy/util/IonElement.kt
similarity index 97%
rename from pig/src/main/kotlin/org/partiql/pig/util/IonElement.kt
rename to pig/src/main/kotlin/org/partiql/pig/legacy/util/IonElement.kt
index ae72ca6..11cdacd 100644
--- a/pig/src/main/kotlin/org/partiql/pig/util/IonElement.kt
+++ b/pig/src/main/kotlin/org/partiql/pig/legacy/util/IonElement.kt
@@ -1,4 +1,4 @@
-package org.partiql.pig.util
+package org.partiql.pig.legacy.util
 
 import com.amazon.ionelement.api.AnyElement
 import com.amazon.ionelement.api.IonElementException
diff --git a/pig/src/main/kotlin/org/partiql/pig/main.kt b/pig/src/main/kotlin/org/partiql/pig/main.kt
deleted file mode 100644
index db26a86..0000000
--- a/pig/src/main/kotlin/org/partiql/pig/main.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- *  permissions and limitations under the License.
- */
-
-package org.partiql.pig
-
-import com.amazon.ion.system.IonReaderBuilder
-import org.partiql.pig.cmdline.Command
-import org.partiql.pig.cmdline.CommandLineParser
-import org.partiql.pig.cmdline.TargetLanguage
-import org.partiql.pig.domain.model.TypeUniverse
-import org.partiql.pig.domain.parser.parseTypeUniverse
-import org.partiql.pig.errors.PigException
-import org.partiql.pig.generator.custom.applyCustomTemplate
-import org.partiql.pig.generator.html.applyHtmlTemplate
-import org.partiql.pig.generator.ion.generateIon
-import org.partiql.pig.generator.kotlin.convertToKTypeUniverse
-import org.partiql.pig.generator.kotlin.generateKotlinCode
-import java.io.File
-import java.io.FileInputStream
-import java.io.PrintWriter
-import kotlin.system.exitProcess
-
-fun progress(msg: String) =
-    println("pig: $msg")
-
-/**
- * Entry point for when pig is being invoked from the command-line.
- */
-fun main(args: Array<String>) {
-    val cmdParser = CommandLineParser()
-
-    when (val command = cmdParser.parse(args)) {
-        is Command.ShowHelp -> cmdParser.printHelp(System.out)
-        is Command.ShowVersion -> cmdParser.printVersion(System.out)
-        is Command.InvalidCommandLineArguments -> {
-            System.err.println(command.message)
-            exitProcess(-1)
-        }
-        is Command.Generate -> {
-            try {
-                generateCode(command)
-            } catch (e: PigException) {
-                System.err.println("pig: ${e.error.location}: ${e.error.context.message}\n${e.stackTrace}")
-                exitProcess(-1)
-            }
-        }
-    }
-}
-
-/**
- * Gradle projects such as the PartiQL reference implementation take a dependency on this project
- * in their `buildSrc` directory and can then use this entry point to generate code direclty without
- * having to `exec` pig as a separate process.
- */
-fun generateCode(command: Command.Generate) {
-    progress("universe file: ${command.typeUniverseFile}")
-
-    progress("parsing the universe...")
-    val typeUniverse: TypeUniverse = FileInputStream(command.typeUniverseFile).use { inputStream ->
-        IonReaderBuilder.standard().build(inputStream).use { ionReader -> parseTypeUniverse(ionReader) }
-    }
-
-    progress("permuting domains...")
-
-    val computedDomains = typeUniverse.computeTypeDomains()
-    val filteredDomains = command.target.domains?.let { computedDomains.filter { domain -> domain.tag in it } } ?: computedDomains
-
-    when (command.target) {
-        is TargetLanguage.Kotlin -> {
-            progress("applying Kotlin pre-processing")
-            val kotlinTypeUniverse = typeUniverse.convertToKTypeUniverse(computedDomains, filteredDomains, command.target.domains)
-            prepareOutputDirectory(command.target.outputDirectory)
-            progress("applying the Kotlin template once for each domain...")
-
-            generateKotlinCode(command.target.namespace, kotlinTypeUniverse, command.target.outputDirectory)
-        }
-        is TargetLanguage.Custom -> {
-            progress("output file  : ${command.target.outputFile}")
-            progress("applying ${command.target.templateFile}")
-
-            PrintWriter(command.target.outputFile).use { printWriter ->
-                applyCustomTemplate(command.target.templateFile, filteredDomains, printWriter)
-            }
-        }
-        is TargetLanguage.Html -> {
-            progress("output file  : ${command.target.outputFile}")
-            progress("applying the HTML template")
-
-            PrintWriter(command.target.outputFile).use { printWriter ->
-                applyHtmlTemplate(filteredDomains, printWriter)
-            }
-        }
-        is TargetLanguage.Ion -> {
-            progress("output file  : ${command.target.outputFile}")
-            progress("applying the Ion template")
-
-            PrintWriter(command.target.outputFile).use { printWriter ->
-                generateIon(filteredDomains, printWriter)
-            }
-        }
-    }
-
-    progress("universe generation complete!")
-}
-
-private fun prepareOutputDirectory(dir: File) {
-    if (dir.exists()) {
-        if (!dir.isDirectory) {
-            error("The path specified as the output directory exists but is not a directory.")
-        }
-    } else {
-        dir.mkdirs()
-    }
-}
diff --git a/pig/src/main/kotlin/org/partiql/pig/model/Model.kt b/pig/src/main/kotlin/org/partiql/pig/model/Model.kt
new file mode 100644
index 0000000..2929145
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/model/Model.kt
@@ -0,0 +1,187 @@
+package org.partiql.pig.model
+
+import net.pearx.kasechange.toPascalCase
+
+typealias Imports = Map<String, String>
+
+/**
+ * Top-level model of a Pig grammar
+ */
+class Universe(
+    val id: String,
+    val types: List<TypeDef>,
+    val imports: Map<String, Imports>
+) {
+
+    fun forEachType(action: (TypeDef) -> Unit) {
+        fun List<TypeDef>.applyToAll() {
+            forEach {
+                action(it)
+                it.children.applyToAll()
+            }
+        }
+        types.applyToAll()
+    }
+}
+
+/**
+ * Definition of some type
+ */
+sealed class TypeDef(val ref: TypeRef.Path) {
+
+    /**
+     * All types defined within this node
+     */
+    abstract val children: List<TypeDef>
+
+    /**
+     * Types defined within this node which are not related to this node "algebraically" such as inline definitions
+     */
+    abstract val types: List<TypeDef>
+
+    /**
+     * TypeDef.Sum represents a list of type variants
+     */
+    class Sum(ref: TypeRef.Path, val variants: List<TypeDef>, override val types: List<TypeDef>) : TypeDef(ref) {
+
+        override val children: List<TypeDef> = variants + types
+
+        override fun toString() = "sum::$ref"
+    }
+
+    /**
+     * TypeDef.Product represents a structure of name/value pairs
+     */
+    class Product(ref: TypeRef.Path, val props: List<TypeProp>, override val types: List<TypeDef>) : TypeDef(ref) {
+
+        override val children: List<TypeDef> = props.filterIsInstance<TypeProp.Inline>().map { it.def } + types
+
+        override fun toString() = "product::$ref(${props.joinToString()})"
+    }
+
+    /**
+     * TypeDef.Enum represents a set of named constants — explicitly not modelled with [Sum]
+     *
+     * Enums routinely required special treatment.. :upside_down_face:
+     */
+    class Enum(ref: TypeRef.Path, val values: List<String>) : TypeDef(ref) {
+
+        override val types: List<TypeDef> = emptyList()
+
+        override val children: List<TypeDef> = emptyList()
+
+        override fun toString() = "enum::$ref::[${values.joinToString()}]"
+    }
+
+    /**
+     * Copy this definition, but make the reference nullable.
+     */
+    fun nullable(): TypeDef {
+        val ref = TypeRef.Path(nullable = true, *ref.path.toTypedArray())
+        return when (this) {
+            is Sum -> Sum(ref, variants, children)
+            is Product -> Product(ref, props, children)
+            is Enum -> Enum(ref, values)
+        }
+    }
+}
+
+/**
+ * Reference to some type
+ */
+sealed class TypeRef(
+    val id: String,
+    val nullable: Boolean
+) {
+
+    override fun equals(other: Any?) =
+        if (other !is TypeRef) false else (id == other.id && nullable == other.nullable)
+
+    override fun hashCode() = id.hashCode()
+
+    override fun toString() = if (nullable) "$id?" else id
+
+    class Scalar(
+        val type: ScalarType,
+        nullable: Boolean = false
+    ) : TypeRef(
+        id = type.toString().toLowerCase(),
+        nullable = nullable
+    )
+
+    class List(
+        val type: TypeRef,
+        nullable: Boolean = false
+    ) : TypeRef(
+        id = "list<$type>",
+        nullable = nullable
+    )
+
+    class Set(
+        val type: TypeRef,
+        nullable: Boolean = false
+    ) : TypeRef(
+        id = "set<$type>",
+        nullable = nullable
+    )
+
+    class Map(
+        val keyType: Scalar,
+        val valType: TypeRef,
+        nullable: Boolean = false
+    ) : TypeRef(
+        id = "map<$keyType, $valType>",
+        nullable = nullable
+    )
+
+    class Path(
+        nullable: Boolean = false,
+        vararg ids: String
+    ) : TypeRef(
+        id = ids.joinToString("."),
+        nullable = nullable
+    ) {
+        val path = ids.asList()
+        val name = ids.last().toPascalCase()
+    }
+
+    class Import(
+        val symbol: String,
+        nullable: Boolean = false
+    ) : TypeRef(
+        id = "import<$symbol>",
+        nullable = nullable
+    )
+}
+
+/**
+ * Product type property
+ */
+sealed class TypeProp(
+    val name: String,
+    val ref: TypeRef
+) {
+
+    override fun toString() = "$name: $ref"
+
+    class Ref(name: String, ref: TypeRef) : TypeProp(name, ref)
+
+    class Inline(name: String, val def: TypeDef) : TypeProp(name, def.ref)
+}
+
+/**
+ * References
+ *  - https://docs.oracle.com/cd/E26161_02/html/GettingStartedGuide/avroschemas.html#avro-primitivedatatypes
+ *  - https://developers.google.com/protocol-buffers/docs/proto3#scalar
+ *  - https://en.wikipedia.org/wiki/JSON#Data_types (scalars only)
+ *  - https://amzn.github.io/ion-docs/docs/spec.html (scalars only)
+ */
+enum class ScalarType {
+    BOOL, // binary value
+    INT, // int32
+    LONG, // int64
+    FLOAT, // IEEE 754 (32 bit)
+    DOUBLE, // IEEE 754 (64 bit)
+    BYTES, // Array of unsigned bytes
+    STRING // Unicode char sequence
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/PigParser.kt b/pig/src/main/kotlin/org/partiql/pig/parser/PigParser.kt
new file mode 100644
index 0000000..56df863
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/PigParser.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.parser
+
+import org.partiql.pig.model.Universe
+import org.partiql.pig.parser.ion.IonTypeParser
+
+/**
+ * Returns a model of the input type universe definition.
+ */
+interface PigParser {
+
+    /**
+     * @param id    Type Universe identifier
+     * @param input Type Universe grammar
+     * @return
+     */
+    fun parse(id: String, input: String): Universe
+
+    companion object {
+
+        fun default(): PigParser = IonTypeParser
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonExtensions.kt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonExtensions.kt
new file mode 100644
index 0000000..24bfc24
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonExtensions.kt
@@ -0,0 +1,216 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.parser.ion
+
+import com.amazon.ion.IonList
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonSymbol
+import com.amazon.ion.IonType
+import com.amazon.ion.IonValue
+import com.amazon.ion.UnknownSymbolException
+import java.util.LinkedList
+import java.util.Stack
+
+/**
+ * Called in the context of parsing a type definition.
+ */
+internal fun IonValue.id(): String {
+    assert(typeAnnotations.size == 1) { "A type definition requires a single identifier annotation, $this" }
+    return typeAnnotations[0]
+}
+
+/**
+ * True iff every value is a Symbol matching [A-Z][A-Z0-9_]*
+ */
+internal fun IonValue.isEnum(): Boolean {
+    if (this !is IonList) return false
+    val pattern = Regex("[A-Z][A-Z0-9_]*")
+    this.forEach {
+        if (it !is IonSymbol || !pattern.matches(it.stringValue())) {
+            return false
+        }
+    }
+    return true
+}
+
+/**
+ * These are all the inline forms; where the inline type identifiers are not "list", "set", or "map".
+ *
+ * foo::{
+ *    a: [...],               // inline sum foo.a
+ *    b: v::[...],            // inline sum foo.v
+ *    c: optional::[...],     // inline sum foo.c, optional field of foo
+ *    d: optional::x::[...],  // inline sum foo.v, optional field of foo
+ *    e: {...},               // inline product foo.e
+ *    f: y::{...},            // inline product foo.y
+ *    g: optional::{...},     // inline product foo.g, optional field of foo
+ *    h: optional::z::{...},  // inline product foo.z, optional field of foo
+ * }
+ */
+internal fun IonValue.isInline(): Boolean {
+    if (fieldName == null) {
+        return false
+    }
+    if (this is IonList || this is IonStruct) {
+        return when (typeAnnotations.size) {
+            0 -> true
+            1 -> typeAnnotations[0] !in IonSymbols.COLLECTIONS
+            2 -> typeAnnotations[1] !in IonSymbols.COLLECTIONS
+            else -> false
+        }
+    }
+    return false
+}
+
+/**
+ * Returns true if this value is of the form
+ *   - _: [ ... ]
+ *   - _::[ ... ]
+ *
+ *  Which represent nested definitions in product and sum types respectively.
+ */
+internal fun IonValue.isContainer(): Boolean {
+    if (type != IonType.LIST) {
+        return false
+    }
+    val symbol = try {
+        // _: [ ]
+        fieldName
+    } catch (_: UnknownSymbolException) {
+        // _::[]
+        typeAnnotations[0]
+    }
+    return symbol == "_"
+}
+
+/**
+ * Called in the context of parsing a type reference; these are all the type reference forms.
+ *
+ * foo::{
+ *    a: x,                     // ref to type x
+ *    b: optional::x,           // ref to type x, optional field of foo
+ *    c: [...],                 // ref to inline sum foo.c
+ *    d: t::[...],              // ref to inline sum foo.t or collection (depends on value of t)
+ *    e: optional::t::[...],    // ref to inline sum foo.t or collection (depends on value of t), optional field of foo
+ *    f: {...},                 // ref to inline product foo.c
+ *    g: s::{...},              // ref to inline product foo.s
+ *    h: optional::s::{...},    // ref to inline product foo.s, optional field of foo
+ * }
+ *
+ * This method intentionally does not make a distinction between refs to inline sum defs and collection type refs.
+ */
+internal fun IonValue.ref(): Pair<String, Boolean> = when (this) {
+    is IonSymbol -> {
+        val prefix = typeAnnotations.joinToString("::")
+        val suffix = stringValue()
+        when (typeAnnotations.size) {
+            0 -> Pair(suffix, false)
+            1 -> {
+                if (typeAnnotations[0] != "optional") {
+                    err("optional::$suffix", "$prefix::$suffix")
+                }
+                Pair(suffix, true)
+            }
+            else -> err(
+                expected = "optional::$suffix or $suffix",
+                found = "$prefix::$suffix"
+            )
+        }
+    }
+    is IonList, is IonStruct -> {
+        val prefix = typeAnnotations.joinToString("::")
+        val suffix = if (this is IonList) "[...]" else "{...}"
+        when (typeAnnotations.size) {
+            0 -> Pair(fieldName, false)
+            1 -> when (val n = typeAnnotations[0]) {
+                "optional" -> Pair(fieldName, true)
+                else -> Pair(n, false)
+            }
+            2 -> {
+                val o = typeAnnotations[0]
+                val n = typeAnnotations[1]
+                if (o != "optional") err("optional::$n::$suffix", "$prefix::$suffix")
+                Pair(n, true)
+            }
+            else -> err(
+                expected = "optional::$suffix or $suffix",
+                found = "$prefix::$suffix"
+            )
+        }
+    }
+    else -> err("symbol, list, or struct", "$type")
+}
+
+private fun err(expected: String, found: String): Nothing {
+    error("invalid type reference, must be of the form $expected, but found `$found`")
+}
+
+/**
+ * Depth-first tree walk
+ */
+internal inline fun IonSymbols.Node.walk(action: (parent: IonSymbols.Node, child: IonSymbols.Node) -> Unit) {
+    val seen = mutableSetOf<IonSymbols.Node>()
+    val stack = Stack<IonSymbols.Node>()
+    stack.push(this)
+    while (stack.isNotEmpty()) {
+        val parent = stack.pop()
+        if (seen.contains(parent)) {
+            continue
+        }
+        seen.add(parent)
+        parent.children.forEach { child ->
+            action.invoke(parent, child)
+            stack.push(child)
+        }
+    }
+}
+
+/**
+ * Breadth-first search
+ */
+internal fun IonSymbols.Node.search(id: String): IonSymbols.Node? {
+    val seen = mutableSetOf<IonSymbols.Node>()
+    val queue = LinkedList<IonSymbols.Node>()
+    queue.add(this)
+    while (queue.isNotEmpty()) {
+        val node = queue.pop()
+        if (node.id == id) {
+            return node
+        }
+        if (seen.contains(node)) {
+            continue
+        }
+        seen.add(node)
+        if (node.parent != null) {
+            queue.add(node.parent)
+        }
+        queue.addAll(node.children)
+    }
+    return null
+}
+
+/**
+ * Search path starting from this
+ */
+internal fun IonSymbols.Node.search(path: List<String>): IonSymbols.Node? {
+    var i = 0
+    var node: IonSymbols.Node? = this
+    while (node != null && i < path.size) {
+        node = node.children.find { it.id == path[i] }
+        i += 1
+    }
+    return node
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonImports.kt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonImports.kt
new file mode 100644
index 0000000..d048ec3
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonImports.kt
@@ -0,0 +1,70 @@
+package org.partiql.pig.parser.ion
+
+import com.amazon.ion.IonList
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonSymbol
+import org.partiql.pig.model.Imports
+
+/**
+ * Holds the map of targets to import statements to be used by generators
+ *
+ * @property symbols    All valid import symbols
+ * @property map        Map a target to its import statements
+ *
+ * Note you could use a map entry instead of symbols, but the logic is simpler this way
+ */
+internal class IonImports private constructor(
+    val symbols: Set<String>,
+    val map: Map<String, Imports>
+) {
+
+    companion object {
+
+        fun build(value: IonStruct?): IonImports {
+            if (value == null) {
+                return IonImports(emptySet(), emptyMap())
+            }
+            val symbols = mutableSetOf<String>()
+            val map = value.associate { list ->
+                if (list !is IonList) {
+                    error("import map values must be of type IonList")
+                }
+                val target = list.fieldName
+                val imports = mutableMapOf<String, String>()
+                list.forEach {
+                    assert(it is IonSymbol)
+                    val v = it as IonSymbol
+                    val symbol = v.id()
+                    if (imports.containsKey(symbol)) {
+                        error("target `$target` defines the import `$symbol` more than once")
+                    }
+                    symbols.add(symbol)
+                    imports[symbol] = v.stringValue()
+                }
+                target to imports
+            }
+            validateImports(symbols, map)
+            return IonImports(symbols, map)
+        }
+
+        /**
+         * Validates that each import block defines all types
+         *
+         * @param symbols
+         * @param map
+         */
+        private fun validateImports(symbols: Set<String>, map: Map<String, Imports>) {
+            val errs = mutableListOf<String>()
+            map.forEach { (target, imports) ->
+                val missing = symbols - imports.keys
+                if (missing.isNotEmpty()) {
+                    val err = "Import `$target` missing definitions for: ${missing.joinToString()}"
+                    errs.add(err)
+                }
+            }
+            if (errs.isNotEmpty()) {
+                error(errs.joinToString("; "))
+            }
+        }
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonSymbols.kt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonSymbols.kt
new file mode 100644
index 0000000..f1aa35b
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonSymbols.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.parser.ion
+
+import com.amazon.ion.IonContainer
+import com.amazon.ion.IonList
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonValue
+import io.github.rchowell.dotlin.graph
+
+/**
+ * Produce a graph of type identifiers from a list of type definitions.
+ */
+internal class IonSymbols private constructor(val root: Node) {
+
+    companion object {
+
+        val COLLECTIONS = setOf("map", "list", "set")
+
+        fun build(definitions: List<IonValue>) = IonSymbols(
+            root = Node(id = "_root").apply {
+                definitions.forEach { type ->
+                    val child = Visitor().visit(type, this)
+                    children.add(child)
+                }
+            }
+        )
+
+        /**
+         * Consider asserting more thorough type definition naming rules ie enforce lower snake case
+         */
+        fun assertNonReserved(id: String, context: String) = assert(!COLLECTIONS.contains(id)) {
+            "Cannot used reserved name `$id` for a type definition, $context."
+        }
+    }
+
+    @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
+    private class Visitor : IonVisitor<Node, Node?> {
+
+        override fun visit(v: IonList, parent: Node?): Node {
+            val id = v.id()
+            assertNonReserved(id, if (parent != null) "child of $parent" else "top-level type")
+            var node = Node(
+                id = id,
+                parent = parent
+            )
+            // Skip this node by linking parent; add all symbols in special container syntax _::[ ... ]
+            if (id == "_") {
+                node = parent ?: error("unexpected container _ at top-level")
+            }
+            if (!v.isEnum()) {
+                v.forEach { node.children.add(visit(it, node)) }
+            }
+            return node
+        }
+
+        override fun visit(v: IonStruct, parent: Node?): Node {
+            val id = v.id()
+            assertNonReserved(id, if (parent != null) "child of $parent" else "top-level type")
+            val node = Node(
+                id = id,
+                parent = parent
+            )
+            v.forEach { field ->
+                when {
+                    field.isContainer() -> {
+                        val children = (field as IonContainer).map { visit(it, node) }
+                        node.children.addAll(children)
+                    }
+                    field.isInline() -> {
+                        val (symbol, nullable) = field.ref()
+                        // DANGER! Mutate annotations to set the definition id as if it weren't an inline
+                        field.setTypeAnnotations(symbol)
+                        // Parse as any other definition
+                        val child = visit(field, node)
+                        // DANGER! Add back the dropped "optional" annotation
+                        if (nullable) field.setTypeAnnotations("optional", symbol)
+                        // Include the inline definition as a child of this node
+                        node.children.add(child)
+                    }
+                }
+            }
+            return node
+        }
+
+        override fun defaultVisit(v: IonValue, parent: Node?) = error("cannot parse value $v")
+    }
+
+    /**
+     * For debugging, consider prefixing node names since names must be globally unique in DOT
+     */
+    override fun toString() = graph {
+        root.children.forEach {
+            +subgraph(it.id) {
+                label = it.id
+                it.walk { parent, child ->
+                    // connection
+                    parent.id - child.id
+                }
+            }
+        }
+    }.dot()
+
+    internal class Node(
+        val id: String,
+        val parent: Node? = null,
+        val children: MutableList<Node> = mutableListOf()
+    ) {
+
+        val path: List<String>
+            get() {
+                val path = mutableListOf<String>()
+                var node: Node? = this
+                while (node != null) {
+                    path.add(node.id)
+                    node = node.parent
+                }
+                // Use [1, path.size) so that `_root` is excluded in the path
+                return path.reversed().subList(1, path.size)
+            }
+
+        override fun toString() = path.joinToString(".")
+
+        override fun hashCode() = path.hashCode()
+        override fun equals(other: Any?) = when (other) {
+            is Node -> this.path == other.path
+            else -> false
+        }
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonTypeParser.kt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonTypeParser.kt
new file mode 100644
index 0000000..682928a
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonTypeParser.kt
@@ -0,0 +1,308 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.parser.ion
+
+import com.amazon.ion.IonContainer
+import com.amazon.ion.IonList
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonSymbol
+import com.amazon.ion.IonType
+import com.amazon.ion.IonValue
+import com.amazon.ion.system.IonSystemBuilder
+import org.partiql.pig.model.ScalarType
+import org.partiql.pig.model.TypeDef
+import org.partiql.pig.model.TypeProp
+import org.partiql.pig.model.TypeRef
+import org.partiql.pig.model.Universe
+import org.partiql.pig.parser.PigParser
+
+/**
+ * Parser for the prototype .ion grammar
+ */
+internal object IonTypeParser : PigParser {
+
+    private val ion = IonSystemBuilder.standard().build()
+
+    override fun parse(id: String, input: String): Universe {
+        val reader = ion.newReader(input)
+        var type = reader.next()
+
+        var importsValue: IonStruct? = null
+        val definitions: MutableList<IonValue> = mutableListOf()
+
+        while (type != null) {
+            val value = ion.newValue(reader)
+            when (val identifier = value.id()) {
+                "imports" -> {
+                    if (importsValue != null) {
+                        error("`imports` has already been set")
+                    }
+                    if (type != IonType.STRUCT) {
+                        error("`imports` must be a struct")
+                    }
+                    if (definitions.isNotEmpty()) {
+                        error("`imports` must appear before all definitions")
+                    }
+                    importsValue = value as IonStruct
+                }
+                else -> {
+                    if (type != IonType.LIST && type != IonType.STRUCT) {
+                        error("type definition `$identifier` must be an IonList or IonStruct")
+                    }
+                    definitions.add(value)
+                }
+            }
+            type = reader.next()
+        }
+
+        // Build the symbol graph prior to parsing definitions
+        val symbols = IonSymbols.build(definitions)
+        val imports = IonImports.build(importsValue)
+
+        return Universe(
+            id = id,
+            types = definitions.map {
+                val ctx = Context(symbols.root, imports)
+                Visitor.visit(it, ctx)
+            },
+            imports = imports.map
+        )
+    }
+
+    /**
+     * Visitor builds a [TypeDef] graph while tracking scope (`ctx.scope`) in the [IonSymbols].
+     *
+     * Instead of tracking in the symbol graph, we could just search from the root, then do the BFS. That is simpler.
+     */
+    private object Visitor : IonVisitor<TypeDef, Context> {
+
+        /**
+         * Parse a [TypeDef.Sum] or [TypeDef.Enum]
+         */
+        override fun visit(v: IonList, ctx: Context): TypeDef = ctx.scope(v) {
+            val ref = ctx.ref()
+            val type = when {
+                v.isEnum() -> TypeDef.Enum(
+                    ref = ref,
+                    values = v.map { (it as IonSymbol).stringValue() }
+                )
+                else -> {
+                    val (variants, types) = visitSumVariants(v, ctx)
+                    TypeDef.Sum(ref, variants, types)
+                }
+            }
+            ctx.define(type)
+        }
+
+        /**
+         * Parse a [TypeDef.Product]
+         */
+        override fun visit(v: IonStruct, ctx: Context): TypeDef = ctx.scope(v) {
+            val ref = ctx.ref()
+            val (props, types) = visitProductProps(v, ctx)
+            val type = TypeDef.Product(ref, props, types)
+            ctx.define(type)
+        }
+
+        /**
+         * Returns a pair of the product def properties and children
+         */
+        private fun visitProductProps(v: IonStruct, ctx: Context): Pair<List<TypeProp>, List<TypeDef>> {
+            val props = mutableListOf<TypeProp>()
+            val types = mutableListOf<TypeDef>()
+            v.forEach { field ->
+                when {
+                    field.isContainer() -> {
+                        // Add all definitions in special container field _: [ ]
+                        val subtypes = (field as IonContainer).map { visit(it, ctx) }
+                        types.addAll(subtypes)
+                    }
+                    field.isInline() -> {
+                        val (symbol, nullable) = field.ref()
+                        // DANGER! Mutate annotations to set the definition id as if it weren't an inline
+                        field.setTypeAnnotations(symbol)
+                        var def = visit(field, ctx)
+                        // DANGER! Add back the dropped "optional" annotation
+                        if (nullable) {
+                            field.setTypeAnnotations("optional", symbol)
+                            def = def.nullable()
+                        }
+                        val prop = TypeProp.Inline(field.fieldName, def)
+                        props.add(prop)
+                    }
+                    else -> {
+                        val prop = TypeProp.Ref(field.fieldName, ctx.resolve(field))
+                        props.add(prop)
+                    }
+                }
+            }
+            return props to types
+        }
+
+        /**
+         * Returns a pair of the sum variants and children
+         */
+        private fun visitSumVariants(v: IonList, ctx: Context): Pair<List<TypeDef>, List<TypeDef>> {
+            val variants = mutableListOf<TypeDef>()
+            val types = mutableListOf<TypeDef>()
+            v.forEach { item ->
+                when {
+                    item.isContainer() -> {
+                        // Add all definitions in special container entry _::[ ]
+                        val subtypes = (item as IonContainer).map { visit(it, ctx) }
+                        types.addAll(subtypes)
+                    }
+                    else -> {
+                        val variant = visit(item, ctx)
+                        variants.add(variant)
+                    }
+                }
+            }
+            return variants to types
+        }
+
+        override fun defaultVisit(v: IonValue, ctx: Context) = error("cannot parse value $v, expect 'struct' or 'list'")
+    }
+
+    /**
+     * Context tracks the visitor scope to keep position in the [IonSymbols] graph.
+     */
+    private class Context(
+        private val root: IonSymbols.Node,
+        private val imports: IonImports
+    ) {
+
+        private var tip: IonSymbols.Node = root
+        private val defs: MutableList<TypeDef> = mutableListOf()
+
+        /**
+         * Produce a [TypeRef] for the current position in the [IonSymbols]
+         */
+        fun ref() = TypeRef.Path(ids = tip.path.toTypedArray())
+
+        fun define(type: TypeDef): TypeDef {
+            defs.add(type)
+            return type
+        }
+
+        /**
+         * Track position in the [IonSymbols] for type reference searches
+         */
+        fun scope(v: IonValue, block: Context.() -> TypeDef): TypeDef {
+            val id = v.id()
+            tip = tip.children.find { it.id == id } ?: error("could not find symbol `$id`")
+            val def = block.invoke(this)
+            tip = tip.parent!! // never pop root
+            return def
+        }
+
+        /**
+         * Create a TypeRef by searching the symbol graph
+         */
+        fun resolve(v: IonValue): TypeRef = when (v) {
+            is IonSymbol -> resolve(v)
+            is IonList -> resolve(v)
+            is IonStruct -> resolve(v)
+            else -> error("cannot resolve type for IonType $v")
+        }
+
+        /**
+         * Resolve a symbolic reference with the given rules
+         */
+        private fun resolve(v: IonSymbol): TypeRef {
+            val (symbol, nullable) = v.ref()
+            val absolute = symbol.startsWith(".")
+            // 1. If absolute, search or err
+            if (absolute) {
+                val path = symbol.trimStart('.').split(".")
+                val node = root.search(path)
+                return when {
+                    node != null -> {
+                        TypeRef.Path(
+                            nullable = nullable,
+                            ids = (node.path.toTypedArray())
+                        )
+                    }
+                    path.size == 1 && imports.symbols.contains(path.first()) -> {
+                        // Import type reference using '.'
+                        TypeRef.Import(path.first(), nullable)
+                    }
+                    else -> {
+                        error("type reference `$symbol` not found")
+                    }
+                }
+            }
+            // 2. Attempt as scalar
+            try {
+                return TypeRef.Scalar(
+                    type = ScalarType.valueOf(symbol.toUpperCase()),
+                    nullable = nullable
+                )
+            } catch (_: IllegalArgumentException) {
+            }
+            // 3. Attempt to find the symbol relative to the current position
+            val node = tip.search(symbol)
+            if (node != null) {
+                return TypeRef.Path(
+                    nullable = nullable,
+                    ids = (node.path.toTypedArray())
+                )
+            }
+            // 4. Attempt to find the symbol in the imports
+            if (imports.symbols.contains(symbol)) {
+                return TypeRef.Import(symbol, nullable)
+            }
+            // 5. Error nothing found
+            error("type reference `$symbol` not found")
+        }
+
+        /**
+         * Resolve the collection type
+         */
+        private fun resolve(v: IonList): TypeRef {
+            val (symbol, nullable) = v.ref()
+            return when (symbol.toLowerCase()) {
+                "list" -> {
+                    assert(v.size == 1) { "list must have exactly one type" }
+                    val t = resolve(v[0])
+                    TypeRef.List(t, nullable)
+                }
+                "set" -> {
+                    assert(v.size == 1) { "set must have exactly one type" }
+                    val t = resolve(v[0])
+                    TypeRef.Set(t, nullable)
+                }
+                "map" -> {
+                    assert(v.size == 2) { "map must have exactly two types" }
+                    assert(v[0] is IonSymbol) { "map key type parameter must be a symbol" }
+                    val kt = resolve(v[0])
+                    val vt = resolve(v[1])
+                    assert(kt is TypeRef.Scalar) { "map key type `$kt` must a scalar" }
+                    assert(!kt.nullable) { "map key type `$kt` cannot be nullable" }
+                    TypeRef.Map(kt as TypeRef.Scalar, vt, nullable)
+                }
+                else -> error("invalid collection type $symbol; must be one of `list`, `set`, or `map`")
+            }
+        }
+
+        /**
+         * Resolve the fully specified property definition
+         */
+        private fun resolve(v: IonStruct): TypeRef {
+            TODO("fully specified property definitions have not been implemented: $v")
+        }
+    }
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonVisitor.kt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonVisitor.kt
new file mode 100644
index 0000000..644c206
--- /dev/null
+++ b/pig/src/main/kotlin/org/partiql/pig/parser/ion/IonVisitor.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.partiql.pig.parser.ion
+
+import com.amazon.ion.IonBlob
+import com.amazon.ion.IonBool
+import com.amazon.ion.IonClob
+import com.amazon.ion.IonDatagram
+import com.amazon.ion.IonDecimal
+import com.amazon.ion.IonFloat
+import com.amazon.ion.IonInt
+import com.amazon.ion.IonList
+import com.amazon.ion.IonLob
+import com.amazon.ion.IonNull
+import com.amazon.ion.IonNumber
+import com.amazon.ion.IonSequence
+import com.amazon.ion.IonSexp
+import com.amazon.ion.IonString
+import com.amazon.ion.IonStruct
+import com.amazon.ion.IonSymbol
+import com.amazon.ion.IonText
+import com.amazon.ion.IonTimestamp
+import com.amazon.ion.IonValue
+
+/**
+ * Not using ValueVisitor here since it does not have a parameterized return type or visitor context.
+ */
+interface IonVisitor<R, C> {
+
+    /*
+     * This could be `<R,C> IonValue.accept(v: Visitor<R, C>, ctx: C): R`, but this is slightly cleaner.
+     */
+    fun visit(v: IonValue, ctx: C): R = when (v) {
+        is IonBlob -> visit(v, ctx)
+        is IonBool -> visit(v, ctx)
+        is IonClob -> visit(v, ctx)
+        is IonDatagram -> visit(v, ctx)
+        is IonDecimal -> visit(v, ctx)
+        is IonFloat -> visit(v, ctx)
+        is IonInt -> visit(v, ctx)
+        is IonList -> visit(v, ctx)
+        is IonLob -> visit(v, ctx)
+        is IonNull -> visit(v, ctx)
+        is IonNumber -> visit(v, ctx)
+        is IonSexp -> visit(v, ctx)
+        is IonSequence -> visit(v, ctx)
+        is IonString -> visit(v, ctx)
+        is IonStruct -> visit(v, ctx)
+        is IonSymbol -> visit(v, ctx)
+        is IonText -> visit(v, ctx)
+        is IonTimestamp -> visit(v, ctx)
+        else -> throw IllegalArgumentException("unknown IonValue $v")
+    }
+
+    fun visit(v: IonBool, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonBlob, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonClob, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonDatagram, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonDecimal, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonFloat, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonInt, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonList, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonLob, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonNull, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonNumber, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonSexp, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonSequence, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonString, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonStruct, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonSymbol, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonText, ctx: C): R = defaultVisit(v, ctx)
+
+    fun visit(v: IonTimestamp, ctx: C): R = defaultVisit(v, ctx)
+
+    fun defaultVisit(v: IonValue, ctx: C): R
+}
diff --git a/pig/src/main/kotlin/org/partiql/pig/parser/ion/note.txt b/pig/src/main/kotlin/org/partiql/pig/parser/ion/note.txt
new file mode 100644
index 0000000..e69de29
diff --git a/pig/src/main/resources/org/partiql/pig/templates/html.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/html.ftl
similarity index 100%
rename from pig/src/main/resources/org/partiql/pig/templates/html.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/html.ftl
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-cross-domain-transform.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-cross-domain-transform.ftl
similarity index 100%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-cross-domain-transform.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-cross-domain-transform.ftl
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-domain.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-domain.ftl
similarity index 99%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-domain.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-domain.ftl
index f659147..7579a97 100644
--- a/pig/src/main/resources/org/partiql/pig/templates/kotlin-domain.ftl
+++ b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-domain.ftl
@@ -5,7 +5,7 @@
 
 -----------------------------------------------------------------------------------------------------]
 
-[#-- @ftlvariable name="domain" type="org.partiql.pig.generator.kotlin.KTypeDomain" --]
+[#-- @ftlvariable name="domain" type="org.partiql.pig.legacy.generator.kotlin.KTypeDomain" --]
 [#-- @ftlvariable name="namespace" type="java.lang.String" --]
 [#-- @ftlvariable name="generatedDate" type="java.time.OffsetDateTime" --]
 [#-- Helpful links documenting Apache Freemarker:
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-header.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-header.ftl
similarity index 91%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-header.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-header.ftl
index 049866c..b4ca2c3 100644
--- a/pig/src/main/resources/org/partiql/pig/templates/kotlin-header.ftl
+++ b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-header.ftl
@@ -9,5 +9,5 @@
 package ${namespace}
 
 import com.amazon.ionelement.api.*
-import org.partiql.pig.runtime.*
+import org.partiql.pig.legacy.runtime.*
 
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-fold.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-fold.ftl
similarity index 96%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-fold.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-fold.ftl
index f117838..3aeec73 100644
--- a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-fold.ftl
+++ b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-fold.ftl
@@ -1,5 +1,5 @@
 [#ftl output_format="plainText"]
-[#-- @ftlvariable name="universe" type="org.partiql.pig.generator.kotlin.KTypeUniverse" --]
+[#-- @ftlvariable name="universe" type="org.partiql.pig.legacy.generator.kotlin.KTypeUniverse" --]
 
 [#macro tuple_visitor_fold_walker_body t visitSuffix]
     [@indent count=4]
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-transform.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-transform.ftl
similarity index 97%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-transform.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-transform.ftl
index 747200c..88f24f3 100644
--- a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor-transform.ftl
+++ b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor-transform.ftl
@@ -1,5 +1,5 @@
 [#ftl output_format="plainText"]
-[#-- @ftlvariable name="universe" type="org.partiql.pig.generator.kotlin.KTypeUniverse" --]
+[#-- @ftlvariable name="universe" type="org.partiql.pig.legacy.generator.kotlin.KTypeUniverse" --]
 
 [#macro transform_fun_body destDomainName t transformFuncName avoidCopyingUnchangedNodes]
     [#list t.properties as p]
diff --git a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor.ftl b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor.ftl
similarity index 96%
rename from pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor.ftl
rename to pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor.ftl
index 047a18e..9d0cd03 100644
--- a/pig/src/main/resources/org/partiql/pig/templates/kotlin-visitor.ftl
+++ b/pig/src/main/resources/org/partiql/pig/legacy/templates/kotlin-visitor.ftl
@@ -1,5 +1,5 @@
 [#ftl output_format="plainText"]
-[#-- @ftlvariable name="domain" type="org.partiql.pig.generator.kotlin.KTypeDomain" --]
+[#-- @ftlvariable name="domain" type="org.partiql.pig.legacy.generator.kotlin.KTypeDomain" --]
 
 [#macro tuple_visitor_walker_body t visitSuffix]
     [@indent count=4]
diff --git a/pig/src/test/kotlin/org/partiql/pig/cmdline/CommandLineParserTests.kt b/pig/src/test/kotlin/org/partiql/pig/cmdline/CommandLineParserTests.kt
deleted file mode 100644
index 19e88cc..0000000
--- a/pig/src/test/kotlin/org/partiql/pig/cmdline/CommandLineParserTests.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- *  permissions and limitations under the License.
- */
-
-package org.partiql.pig.cmdline
-
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
-import java.io.File
-
-class CommandLineParserTests {
-
-    @ParameterizedTest
-    @MethodSource("parametersForTests")
-    fun tests(tc: TestCase) {
-        val parser = CommandLineParser()
-        val action = parser.parse(tc.args.toTypedArray())
-
-        assertEquals(tc.expected, action)
-    }
-
-    companion object {
-
-        class TestCase(val expected: Command, val args: List<String>) {
-            constructor(expected: Command, vararg args: String) : this(expected, args.toList())
-        }
-
-        @JvmStatic
-        @Suppress("unused")
-        fun parametersForTests() = listOf(
-            // Help
-            TestCase(Command.ShowHelp, "-h"),
-            TestCase(Command.ShowHelp, "--help"),
-
-            // //////////////////////////////////////////////////////
-            // Missing parameters required for all language targets
-            // //////////////////////////////////////////////////////
-            // No --universe
-            TestCase(
-                Command.InvalidCommandLineArguments("Missing required option(s) [u/universe]"),
-                "--target=kotlin", "--output-directory=out_dir", "--namespace=some.package"
-            ),
-
-            // No --target
-            TestCase(
-                Command.InvalidCommandLineArguments("Missing required option(s) [t/target]"),
-                "--universe=input.ion", "--output-directory=out_dir", "--namespace=some.package"
-            ),
-
-            // No --output-file argument
-            TestCase(
-                Command.InvalidCommandLineArguments("The selected language target requires the --output-file argument"),
-                "--universe=input.ion", "--target=custom", "--template=some.template"
-            ),
-
-            // No --output-directory argument
-            TestCase(
-                Command.InvalidCommandLineArguments("The selected language target requires the --output-directory argument"),
-                "--universe=input.ion", "--target=kotlin", "--namespace=some.package"
-            ),
-
-            // //////////////////////////////////////////////////////
-            // Kotlin target
-            // //////////////////////////////////////////////////////
-            // long parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"))),
-                "--universe=input.ion", "--target=kotlin", "--output-directory=out_dir", "--namespace=some.package"
-            ),
-
-            // short parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"))),
-                "-u=input.ion", "-t=kotlin", "-d=out_dir", "-n=some.package"
-            ),
-
-            // accepts --domains to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"), domains = setOf("foo", "bar"))),
-                "--universe=input.ion", "--target=kotlin", "--output-directory=out_dir", "--namespace=some.package", "--domains=foo,bar"
-            ),
-
-            // accepts -f to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"), domains = setOf("foo", "bar"))),
-                "-u=input.ion", "-t=kotlin", "-d=out_dir", "-n=some.package", "-f=foo,bar"
-            ),
-
-            // missing the --namespace argument
-            TestCase(
-                Command.InvalidCommandLineArguments("The selected language target requires the --namespace argument"),
-                "-u=input.ion", "-t=kotlin", "-o=out_dir"
-            ),
-
-            // //////////////////////////////////////////////////////
-            // Html target
-            // //////////////////////////////////////////////////////
-            // long parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"))),
-                "--universe=input.ion", "--target=html", "--output-file=output.html"
-            ),
-
-            // short parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"))),
-                "-u=input.ion", "-target=html", "--output-file=output.html"
-            ),
-
-            // accepts --domains to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"), domains = setOf("foo", "bar"))),
-                "--universe=input.ion", "--target=html", "--output-file=output.html", "--domains=foo,bar"
-            ),
-
-            // accepts -f to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"), domains = setOf("foo", "bar"))),
-                "-u=input.ion", "-target=html", "--output-file=output.html", "-f=foo,bar"
-            ),
-
-            // //////////////////////////////////////////////////////
-            // Ion target
-            // //////////////////////////////////////////////////////
-            // long parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"))),
-                "--universe=input.ion", "--target=ion", "--output-file=output.ion"
-            ),
-
-            // short parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"))),
-                "-u=input.ion", "-target=ion", "--output-file=output.ion"
-            ),
-
-            // accepts --domains to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"), domains = setOf("foo", "bar"))),
-                "--universe=input.ion", "--target=ion", "--output-file=output.ion", "--domains=foo,bar"
-            ),
-
-            // accepts -f to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"), domains = setOf("foo", "bar"))),
-                "-u=input.ion", "-target=ion", "--output-file=output.ion", "-f=foo,bar"
-            ),
-
-            // //////////////////////////////////////////////////////
-            // Custom target
-            // //////////////////////////////////////////////////////
-            // long parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"))),
-                "--universe=input.ion", "--target=custom", "--output-file=output.txt", "--template=template.ftl"
-            ),
-
-            // short parameter names
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"))),
-                "-u=input.ion", "-t=custom", "-o=output.txt", "-e=template.ftl"
-            ),
-
-            // accepts --domains to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"), domains = setOf("foo", "bar"))),
-                "--universe=input.ion", "--target=custom", "--output-file=output.txt", "--template=template.ftl", "--domains=foo,bar"
-            ),
-
-            // accepts -f to filter for specific domains
-            TestCase(
-                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"), domains = setOf("foo", "bar"))),
-                "-u=input.ion", "-target=custom", "--output-file=output.txt", "-e=template.ftl", "-f=foo,bar"
-            ),
-
-            // missing the --template argument
-            TestCase(
-                Command.InvalidCommandLineArguments("The selected language target requires the --template argument"),
-                "-u=input.ion", "-t=custom", "-o=output.kt"
-            )
-        )
-    }
-}
diff --git a/pig/src/test/kotlin/org/partiql/pig/legacy/cmdline/CommandLineParserTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/cmdline/CommandLineParserTests.kt
new file mode 100644
index 0000000..770725c
--- /dev/null
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/cmdline/CommandLineParserTests.kt
@@ -0,0 +1,340 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package org.partiql.pig.legacy.cmdline
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.partiql.pig.Pig
+import org.partiql.pig.legacy.LegacyCommand
+import picocli.CommandLine
+import java.io.File
+
+class CommandLineParserTests {
+
+    class CommandLineParser {
+
+        fun parse(args: Array<out String>): Command {
+            val cli = CommandLine(Pig()).setCaseInsensitiveEnumValuesAllowed(true)
+            cli.execute(*args)
+            return LegacyCommand.previous!!
+        }
+    }
+
+    @ParameterizedTest(name = "TestCase: {index} : {0}")
+    @MethodSource("parametersForTests")
+    fun tests(tc: TestCase) {
+        val parser = CommandLineParser()
+        val action = parser.parse(tc.args.toTypedArray())
+
+        assertEquals(tc.expected, action)
+    }
+
+    companion object {
+
+        class TestCase(val expected: Command, val args: List<String>) {
+            constructor(expected: Command, vararg args: String) : this(expected, args.toList())
+
+            override fun toString() = "pig ${args.joinToString(" ")}"
+        }
+
+        @JvmStatic
+        @Suppress("unused")
+        fun parametersForTests() = listOf(
+            // // 1. Help
+            // TestCase(Command.ShowHelp, "legacy", "--capture", "-h"),
+            // // 2. Help
+            // TestCase(Command.ShowHelp, "legacy", "--capture", "--help"),
+            //
+            // // //////////////////////////////////////////////////////
+            // // Missing parameters required for all language targets
+            // // //////////////////////////////////////////////////////
+            // // 3. No --universe
+            // TestCase(
+            //     Command.InvalidCommandLineArguments("Missing required option(s) [u/universe]"),
+            //     "legacy",
+            //     "--capture",
+            //     "--target=kotlin",
+            //     "--output-directory=out_dir",
+            //     "--namespace=some.package"
+            // ),
+            //
+            // // 4. No --target
+            // TestCase(
+            //     Command.InvalidCommandLineArguments("Missing required option(s) [t/target]"),
+            //     "legacy",
+            //     "--capture",
+            //     "--universe=input.ion",
+            //     "--output-directory=out_dir",
+            //     "--namespace=some.package"
+            // ),
+            //
+            // // 5. No --output-file argument
+            // TestCase(
+            //     Command.InvalidCommandLineArguments("The selected language target CUSTOM requires the --output-file argument"),
+            //     "legacy",
+            //     "--capture",
+            //     "--universe=input.ion",
+            //     "--target=custom",
+            //     "--template=some.template"
+            // ),
+            //
+            // // 6. No --output-directory argument
+            // TestCase(
+            //     Command.InvalidCommandLineArguments("The selected language target KOTLIN requires the --output-directory argument"),
+            //     "legacy",
+            //     "--capture",
+            //     "--universe=input.ion",
+            //     "--target=kotlin",
+            //     "--namespace=some.package"
+            // ),
+
+            // //////////////////////////////////////////////////////
+            // Kotlin target
+            // //////////////////////////////////////////////////////
+
+            // 7. long parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"))),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=kotlin",
+                "--output-directory=out_dir",
+                "--namespace=some.package"
+            ),
+
+            // 8. short parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Kotlin("some.package", File("out_dir"))),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "-t=kotlin",
+                "-d=out_dir",
+                "-n=some.package"
+            ),
+
+            // 9. accepts --domains to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Kotlin("some.package", File("out_dir"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=kotlin",
+                "--output-directory=out_dir",
+                "--namespace=some.package",
+                "--domains=foo,bar"
+            ),
+
+            // 10. accepts -f to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Kotlin("some.package", File("out_dir"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "-t=kotlin",
+                "-d=out_dir",
+                "-n=some.package",
+                "-f=foo,bar"
+            ),
+
+            // 11. missing the --namespace argument
+            TestCase(
+                Command.InvalidCommandLineArguments("The selected language target KOTLIN requires the --namespace argument"),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "-t=kotlin",
+                "-o=out_dir"
+            ),
+
+            // //////////////////////////////////////////////////////
+            // Html target
+            // //////////////////////////////////////////////////////
+
+            // 12. long parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"))),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=html",
+                "--output-file=output.html"
+            ),
+
+            // 13. short parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Html(File("output.html"))),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "--target=html",
+                "--output-file=output.html"
+            ),
+
+            // 14. accepts --domains to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Html(File("output.html"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=html",
+                "--output-file=output.html",
+                "--domains=foo,bar"
+            ),
+
+            // 15. accepts -f to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Html(File("output.html"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "--target=html",
+                "--output-file=output.html",
+                "-f=foo,bar"
+            ),
+
+            // //////////////////////////////////////////////////////
+            // Ion target
+            // //////////////////////////////////////////////////////
+            // long parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"))),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=ion",
+                "--output-file=output.ion"
+            ),
+
+            // short parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Ion(File("output.ion"))),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "--target=ion",
+                "--output-file=output.ion"
+            ),
+
+            // accepts --domains to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Ion(File("output.ion"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=ion",
+                "--output-file=output.ion",
+                "--domains=foo,bar"
+            ),
+
+            // accepts -f to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Ion(File("output.ion"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "--target=ion",
+                "--output-file=output.ion",
+                "-f=foo,bar"
+            ),
+
+            // //////////////////////////////////////////////////////
+            // Custom target
+            // //////////////////////////////////////////////////////
+            // long parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"))),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=custom",
+                "--output-file=output.txt",
+                "--template=template.ftl"
+            ),
+
+            // short parameter names
+            TestCase(
+                Command.Generate(File("input.ion"), TargetLanguage.Custom(File("template.ftl"), File("output.txt"))),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "-t=custom",
+                "-o=output.txt",
+                "-e=template.ftl"
+            ),
+
+            // accepts --domains to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Custom(File("template.ftl"), File("output.txt"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "--universe=input.ion",
+                "--target=custom",
+                "--output-file=output.txt",
+                "--template=template.ftl",
+                "--domains=foo,bar"
+            ),
+
+            // accepts -f to filter for specific domains
+            TestCase(
+                Command.Generate(
+                    File("input.ion"),
+                    TargetLanguage.Custom(File("template.ftl"), File("output.txt"), domains = setOf("foo", "bar"))
+                ),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "--target=custom",
+                "--output-file=output.txt",
+                "-e=template.ftl",
+                "-f=foo,bar"
+            ),
+
+            // missing the --template argument
+            TestCase(
+                Command.InvalidCommandLineArguments("The selected language target CUSTOM requires the --template argument"),
+                "legacy",
+                "--capture",
+                "-u=input.ion",
+                "-t=custom",
+                "-o=output.kt"
+            )
+        )
+    }
+}
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/PermuteDomainTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/PermuteDomainTests.kt
similarity index 95%
rename from pig/src/test/kotlin/org/partiql/pig/domain/PermuteDomainTests.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/PermuteDomainTests.kt
index b116877..5e9b16f 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/PermuteDomainTests.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/PermuteDomainTests.kt
@@ -13,16 +13,16 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import com.amazon.ion.system.IonReaderBuilder
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
-import org.partiql.pig.domain.model.Arity
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.TypeUniverse
-import org.partiql.pig.domain.parser.parseTypeUniverse
+import org.partiql.pig.legacy.model.Arity
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.TypeUniverse
+import org.partiql.pig.legacy.parser.parseTypeUniverse
 
 class PermuteDomainTests {
     /**
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/TypeAnnotationParserTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeAnnotationParserTests.kt
similarity index 92%
rename from pig/src/test/kotlin/org/partiql/pig/domain/TypeAnnotationParserTests.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeAnnotationParserTests.kt
index baccf02..501bdd6 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/TypeAnnotationParserTests.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeAnnotationParserTests.kt
@@ -1,12 +1,12 @@
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import com.amazon.ion.system.IonReaderBuilder
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.TypeAnnotation
-import org.partiql.pig.domain.parser.parseTypeUniverse
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.TypeAnnotation
+import org.partiql.pig.legacy.parser.parseTypeUniverse
 
 class TypeAnnotationParserTests {
 
@@ -57,7 +57,7 @@ class TypeAnnotationParserTests {
 
         data class TestCase(
             val definition: String,
-            val assertion: (type: DataType.UserType) -> Unit,
+            val assertion: (type: DataType.UserType) -> Unit
         )
 
         @JvmStatic
@@ -82,7 +82,7 @@ class TypeAnnotationParserTests {
                         "other" -> assert(v.annotations.isEmpty())
                     }
                 }
-            },
+            }
         )
     }
 }
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserErrorsTest.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserErrorsTest.kt
similarity index 94%
rename from pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserErrorsTest.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserErrorsTest.kt
index 7e64a2c..ec97282 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserErrorsTest.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserErrorsTest.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import com.amazon.ionelement.api.ElementType
 import com.amazon.ionelement.api.IonElementException
@@ -23,10 +23,11 @@ import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import org.partiql.pig.domain.parser.ParserErrorContext
-import org.partiql.pig.domain.parser.parseTypeUniverse
-import org.partiql.pig.errors.PigError
-import org.partiql.pig.errors.PigException
+import org.partiql.pig.legacy.errors.PigError
+import org.partiql.pig.legacy.errors.PigException
+import org.partiql.pig.legacy.parser.ParserErrorContext
+import org.partiql.pig.legacy.parser.parseTypeUniverse
+import org.partiql.pig.legacy.toIonElement
 
 class TypeDomainParserErrorsTest {
 
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserTests.kt
similarity index 96%
rename from pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserTests.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserTests.kt
index 1171b00..c68ae13 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainParserTests.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainParserTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import com.amazon.ion.system.IonReaderBuilder
 import com.amazon.ionelement.api.IonElementLoaderOptions
@@ -23,7 +23,8 @@ import com.amazon.ionelement.api.ionSymbol
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
-import org.partiql.pig.domain.parser.parseTypeUniverse
+import org.partiql.pig.legacy.parser.parseTypeUniverse
+import org.partiql.pig.legacy.toIonElement
 
 class TypeDomainParserTests {
     private val loader = createIonElementLoader(IonElementLoaderOptions(includeLocationMeta = true))
@@ -37,6 +38,7 @@ class TypeDomainParserTests {
                         (product bar a::bat b::(? baz) c::(* blargh 10))))
             """
     )
+
     @Test
     fun testTransform() = runTestCase("(transform domain_a domain_b)")
 
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainSemanticCheckerTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainSemanticCheckerTests.kt
similarity index 98%
rename from pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainSemanticCheckerTests.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainSemanticCheckerTests.kt
index 0c4ede3..2b3efd5 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/TypeDomainSemanticCheckerTests.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/TypeDomainSemanticCheckerTests.kt
@@ -13,16 +13,16 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import org.partiql.pig.domain.model.SemanticErrorContext
-import org.partiql.pig.domain.parser.parseTypeUniverse
-import org.partiql.pig.errors.PigError
-import org.partiql.pig.errors.PigException
+import org.partiql.pig.legacy.errors.PigError
+import org.partiql.pig.legacy.errors.PigException
+import org.partiql.pig.legacy.model.SemanticErrorContext
+import org.partiql.pig.legacy.parser.parseTypeUniverse
 
 class TypeDomainSemanticCheckerTests {
 
@@ -205,6 +205,7 @@ class TypeDomainSemanticCheckerTests {
                 makeErr(1, 53, SemanticErrorContext.NameAlreadyUsed("dup_tag", "some_domain"))
             )
         )
+
         @JvmStatic
         @Suppress("unused")
         fun parametersForNameErrorsTest2() = listOf(
diff --git a/pig/src/test/kotlin/org/partiql/pig/domain/Util.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/Util.kt
similarity index 86%
rename from pig/src/test/kotlin/org/partiql/pig/domain/Util.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/domain/Util.kt
index d6dbd05..b6a135d 100644
--- a/pig/src/test/kotlin/org/partiql/pig/domain/Util.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/domain/Util.kt
@@ -13,11 +13,11 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.domain
+package org.partiql.pig.legacy.domain
 
 import com.amazon.ionelement.api.IonTextLocation
-import org.partiql.pig.errors.ErrorContext
-import org.partiql.pig.errors.PigError
+import org.partiql.pig.legacy.errors.ErrorContext
+import org.partiql.pig.legacy.errors.PigError
 
 fun makeErr(line: Int, col: Int, errorContext: ErrorContext) =
     PigError(IonTextLocation(line.toLong(), col.toLong()), errorContext)
diff --git a/pig/src/test/kotlin/org/partiql/pig/generator/FreeMarkerFunctionsTest.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/FreeMarkerFunctionsTest.kt
similarity index 97%
rename from pig/src/test/kotlin/org/partiql/pig/generator/FreeMarkerFunctionsTest.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/generator/FreeMarkerFunctionsTest.kt
index 079368b..1a13331 100644
--- a/pig/src/test/kotlin/org/partiql/pig/generator/FreeMarkerFunctionsTest.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/FreeMarkerFunctionsTest.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator
+package org.partiql.pig.legacy.generator
 
 import freemarker.cache.StringTemplateLoader
 import org.junit.jupiter.api.Test
diff --git a/pig/src/test/kotlin/org/partiql/pig/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt
similarity index 93%
rename from pig/src/test/kotlin/org/partiql/pig/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt
index 7ec4c1f..e0bf602 100644
--- a/pig/src/test/kotlin/org/partiql/pig/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/custom/CreateCustomFreeMarkerGlobalsTest.kt
@@ -13,18 +13,18 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.generator.custom
+package org.partiql.pig.legacy.generator.custom
 
 import com.amazon.ionelement.api.emptyMetaContainer
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.partiql.pig.domain.model.Arity
-import org.partiql.pig.domain.model.DataType
-import org.partiql.pig.domain.model.NamedElement
-import org.partiql.pig.domain.model.TupleType
-import org.partiql.pig.domain.model.TypeDomain
-import org.partiql.pig.domain.model.TypeRef
-import org.partiql.pig.domain.model.TypeUniverse
+import org.partiql.pig.legacy.model.Arity
+import org.partiql.pig.legacy.model.DataType
+import org.partiql.pig.legacy.model.NamedElement
+import org.partiql.pig.legacy.model.TupleType
+import org.partiql.pig.legacy.model.TypeDomain
+import org.partiql.pig.legacy.model.TypeRef
+import org.partiql.pig.legacy.model.TypeUniverse
 import java.time.OffsetDateTime
 
 class CreateCustomFreeMarkerGlobalsTest {
diff --git a/pig/src/test/kotlin/org/partiql/pig/generator/ion/GenerateIonTest.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/ion/GenerateIonTest.kt
similarity index 96%
rename from pig/src/test/kotlin/org/partiql/pig/generator/ion/GenerateIonTest.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/generator/ion/GenerateIonTest.kt
index 2da9f00..f648cd0 100644
--- a/pig/src/test/kotlin/org/partiql/pig/generator/ion/GenerateIonTest.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/ion/GenerateIonTest.kt
@@ -1,8 +1,8 @@
-package org.partiql.pig.generator.ion
+package org.partiql.pig.legacy.generator.ion
 
 import com.amazon.ion.system.IonReaderBuilder
 import org.junit.jupiter.api.Test
-import org.partiql.pig.domain.parser.parseTypeUniverse
+import org.partiql.pig.legacy.parser.parseTypeUniverse
 import java.io.PrintWriter
 import java.io.StringWriter
 import kotlin.test.assertEquals
diff --git a/pig/src/test/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverterKtTest.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverterKtTest.kt
similarity index 96%
rename from pig/src/test/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverterKtTest.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverterKtTest.kt
index 46be685..7c85029 100644
--- a/pig/src/test/kotlin/org/partiql/pig/generator/kotlin/KTypeDomainConverterKtTest.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/generator/kotlin/KTypeDomainConverterKtTest.kt
@@ -1,8 +1,8 @@
-package org.partiql.pig.generator.kotlin
+package org.partiql.pig.legacy.generator.kotlin
 
 import com.amazon.ion.system.IonReaderBuilder
 import org.junit.jupiter.api.Test
-import org.partiql.pig.domain.parser.parseTypeUniverse
+import org.partiql.pig.legacy.parser.parseTypeUniverse
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
diff --git a/pig/src/test/kotlin/org/partiql/pig/util/CapitalizerTests.kt b/pig/src/test/kotlin/org/partiql/pig/legacy/util/CapitalizerTests.kt
similarity index 98%
rename from pig/src/test/kotlin/org/partiql/pig/util/CapitalizerTests.kt
rename to pig/src/test/kotlin/org/partiql/pig/legacy/util/CapitalizerTests.kt
index 055b2fd..0fa5da7 100644
--- a/pig/src/test/kotlin/org/partiql/pig/util/CapitalizerTests.kt
+++ b/pig/src/test/kotlin/org/partiql/pig/legacy/util/CapitalizerTests.kt
@@ -13,7 +13,7 @@
  *  permissions and limitations under the License.
  */
 
-package org.partiql.pig.util
+package org.partiql.pig.legacy.util
 
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
@@ -33,6 +33,7 @@ class CapitalizerTests {
         assertEquals("OneTwoThree", "one_two_three".snakeToPascalCase())
         assertEquals("OneTwo", "one__two".snakeToPascalCase())
     }
+
     @Test
     fun snakeToCamelCase() {
         assertEquals("one", "one".snakeToCamelCase())
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5e9117b..dde137f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,13 +15,6 @@
 
 rootProject.name = "PIG"
 
-pluginManagement {
-    includeBuild("pig-gradle-plugin")
-    repositories {
-        gradlePluginPortal()
-    }
-}
-
 include(
     "pig",
     "pig-runtime",