From 27077050b6130cf32bbf7d6133fe207a28ab8b78 Mon Sep 17 00:00:00 2001
From: Casey Brooks <cjbrooks12@gmail.com>
Date: Fri, 14 May 2021 09:50:40 -0500
Subject: [PATCH] [major] normalize all Copper Leaf repos

---
 .editorconfig                                 |   4 +
 .github/workflows/pr_master.yml               |  56 +++++
 .github/workflows/push_dev.yml                |  57 ++++++
 .github/workflows/push_docs.yml               |  30 +++
 .github/workflows/push_master.yml             |  84 ++++++++
 .gitignore                                    |  94 ++++++---
 CHANGELOG.md                                  |   3 +
 LICENSE.md                                    |  18 +-
 README.md                                     | 140 +++----------
 build.gradle                                  |  63 ------
 build.gradle.kts                              |   5 +
 buildSrc/build.gradle.kts                     |  15 +-
 buildSrc/settings.gradle.kts                  |   1 +
 buildSrc/src/main/kotlin/Config.kt            |  14 ++
 buildSrc/src/main/kotlin/Libs.kt              | 128 ------------
 buildSrc/src/main/kotlin/Utils.kt             | 176 ++++++++++++++++
 buildSrc/src/main/kotlin/Versions.kt          |  49 -----
 .../main/kotlin/copper-leaf-base.gradle.kts   |  20 ++
 .../main/kotlin/copper-leaf-lint.gradle.kts   |  24 +++
 .../kotlin/copper-leaf-publish.gradle.kts     |  87 ++++++++
 .../main/kotlin/copper-leaf-shadow.gradle.kts |  15 ++
 .../kotlin/copper-leaf-version.gradle.kts     |  14 ++
 .../main/kotlin/kodiak-formatters.gradle.kts  |  40 ++++
 .../src/main/kotlin/kodiak-models.gradle.kts  |  37 ++++
 .../src/main/kotlin/kodiak-runners.gradle.kts |  43 ++++
 common/common-formatter/build.gradle.kts      |  37 +++-
 .../common-formatter/src/main/kotlin/utils.kt |   2 +-
 common/common-models/build.gradle.kts         |  37 +++-
 .../src/main/kotlin/AutoDocument.kt           |  10 +-
 .../src/main/kotlin/CommentTag.kt             |   4 +-
 .../src/main/kotlin/JsonableDocElement.kt     |   6 +-
 .../src/main/kotlin/SpecializedDocElement.kt  |   2 +-
 .../src/test/kotlin/RichTextComponentTest.kt  |  67 ------
 .../kodiak/common}/AutoDocumentTest.kt        |  12 +-
 .../kodiak/common}/CommentTagTest.kt          |  99 +++++----
 .../kodiak/common/RichTextComponentTest.kt    |  72 +++++++
 common/common-runner/build.gradle             |  22 --
 common/common-runner/build.gradle.kts         |  61 ++++++
 .../src/main/kotlin/BaseDocInvoker.kt         |   9 +-
 .../src/main/kotlin/DocInvokerDescriptor.kt   |   2 +-
 .../kotlin/modules/DelegatingModuleLocator.kt |   3 +-
 .../modules/DelegatingProjectRootLocator.kt   |   5 +-
 .../src/main/kotlin/modules/ModuleLocator.kt  |   6 +-
 .../main/kotlin/modules/ProjectRootLocator.kt |   7 +-
 .../impl/modulelocator/GradleModuleLocator.kt |   5 +-
 .../impl/modulelocator/MavenModuleLocator.kt  |   5 +-
 .../rootlocator/DefaultProjectRootLocator.kt  |   3 +-
 .../impl/rootlocator/GitProjectRootLocator.kt |   9 +-
 common/common-runner/src/main/kotlin/utils.kt |  18 +-
 docs/build.gradle.kts                         |  42 ++--
 docs/src/orchid/resources/404.peb             |   9 -
 .../resources/assets/media/theme-logo.png     | Bin 25844 -> 0 bytes
 .../assets/media/undraw_page_not_found.svg    |   1 -
 docs/src/orchid/resources/config.yml          | 114 ++++++-----
 .../src/orchid/resources/config/kotlindoc.yml |  44 ----
 docs/src/orchid/resources/homepage.md         | 191 +++++++++++++++++-
 .../resources/templates/includes/footer.peb   |  15 --
 .../templates/layouts/base/sidebarBase.peb    | 123 -----------
 .../pages/sourceDocModuleHomepage.peb         |  12 --
 docs/src/orchid/resources/wiki/page-one.md    |   2 -
 docs/src/orchid/resources/wiki/summary.md     |   2 -
 dokka/README.md                               |  48 -----
 dokka/dokka-formatter/build.gradle.kts        |  17 +-
 .../src/main/kotlin/DokkaJsonFileGenerator.kt |  16 +-
 .../main/kotlin/DokkaJsonFormatDescriptor.kt  |   4 +-
 .../src/main/kotlin/DokkaJsonFormatter.kt     |  12 +-
 .../src/main/kotlin/formatter/formatClass.kt  |  15 +-
 .../kotlin/formatter/formatCompanionObject.kt |   3 +-
 .../kotlin/formatter/formatConstructor.kt     |   4 -
 .../main/kotlin/formatter/formatContent.kt    |  86 ++++----
 .../src/main/kotlin/formatter/formatEnum.kt   |   6 +-
 .../src/main/kotlin/formatter/formatField.kt  |   8 +-
 .../main/kotlin/formatter/formatHelpers.kt    |   2 +-
 .../src/main/kotlin/formatter/formatMethod.kt |   4 -
 .../main/kotlin/formatter/formatPackage.kt    |  15 +-
 .../main/kotlin/formatter/formatParameters.kt |   5 +-
 .../main/kotlin/formatter/formatTypealias.kt  |   2 -
 dokka/dokka-models/build.gradle.kts           |  12 +-
 .../src/main/kotlin/KotlinClass.kt            |  42 ++--
 .../src/main/kotlin/KotlinConstructor.kt      |  13 +-
 .../src/main/kotlin/KotlinField.kt            |   6 +-
 .../src/main/kotlin/KotlinMethod.kt           |  15 +-
 .../src/main/kotlin/KotlinModuleDoc.kt        |  10 +-
 .../src/main/kotlin/KotlinPackage.kt          |  42 ++--
 dokka/dokka-runner/build.gradle.kts           |  17 +-
 .../copperleaf/kodiak/KotlinClassGenerics.kt  |   1 -
 .../kodiak/KotlinClassWithCompanionObject.kt  |   4 +-
 .../kodiak/KotlinClassWithLibraryClasses.kt   |  12 +-
 .../com/copperleaf/kodiak/KotlinFunctions.kt  |   4 +-
 .../copperleaf/kodiak/KotlinInlineClass.kt    |   2 +-
 .../com/copperleaf/kodiak/KotlinMarkdown.kt   |   6 +-
 .../copperleaf/kodiak/KotlinObjectClass.kt    |   2 +-
 .../copperleaf/kodiak/KotlinSealedClasses.kt  |   2 +-
 .../copperleaf/kodiak/KotlinTypeAliases.kt    |   2 +-
 .../kodiak/one/KotlinSubclassOne.kt           |   6 +-
 .../one/three/four/five/KotlinSubclassFour.kt |   6 +-
 .../kodiak/one/two/KotlinSubclassTwo.kt       |   6 +-
 .../three/four/five/KotlinSubclassThree.kt    |   6 +-
 .../{lib.kt => KotlindocInvokerImpl.kt}       |  11 +-
 .../src/test/kotlin/DokkaJsonRunnerTest.kt    |  24 +--
 gradle.properties                             |  12 ++
 gradle/actions/publish.gradle                 |  89 --------
 gradle/actions/shadow.gradle                  |   8 -
 gradle/groups/formatters.gradle               |  48 -----
 gradle/groups/models.gradle                   |  50 -----
 gradle/groups/runners.gradle                  |  50 -----
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 groovydoc/README.md                           |  48 -----
 .../groovydoc-formatter/build.gradle.kts      |  20 +-
 ...ovydocJsonTool.kt => GroovyDocJsonTool.kt} |  28 ++-
 .../src/main/kotlin/GroovydocJsonFormatter.kt |   7 +-
 .../src/main/kotlin/formatter/formatClass.kt  |  10 +-
 .../main/kotlin/formatter/formatHelpers.kt    |  26 +--
 .../main/kotlin/formatter/formatPackage.kt    |   2 +-
 .../main/kotlin/formatter/formatParameters.kt |  19 +-
 .../src/main/kotlin/main.kt                   |   7 +-
 groovydoc/groovydoc-models/build.gradle.kts   |  12 +-
 .../src/main/kotlin/GroovyClass.kt            |  37 ++--
 .../src/main/kotlin/GroovyConstructor.kt      |  11 +-
 .../src/main/kotlin/GroovyField.kt            |   6 +-
 .../src/main/kotlin/GroovyMethod.kt           |  13 +-
 .../src/main/kotlin/GroovyModuleDoc.kt        |  10 +-
 .../src/main/kotlin/GroovyPackage.kt          |  33 +--
 groovydoc/groovydoc-runner/build.gradle.kts   |  22 +-
 .../{lib.kt => GroovydocInvokerImpl.kt}       |  14 +-
 .../groovydoc/json/GroovydocJsonRunnerTest.kt |  24 +--
 javadoc/README.md                             |  47 -----
 javadoc/javadoc-formatter/build.gradle        |  12 --
 javadoc/javadoc-formatter/build.gradle.kts    |  20 ++
 .../src/main/kotlin/JavadocJsonDoclet.kt      |  16 +-
 .../src/main/kotlin/formatter/formatClass.kt  |   2 +-
 .../main/kotlin/formatter/formatContent.kt    |   1 -
 .../kotlin/formatter/formatEnumConstant.kt    |   2 +-
 .../main/kotlin/formatter/formatHelpers.kt    |   2 +-
 .../main/kotlin/formatter/formatPackage.kt    |   2 +-
 .../main/kotlin/formatter/formatParameters.kt |   3 +-
 javadoc/javadoc-models/build.gradle.kts       |  12 +-
 .../kodiak/java/models}/JavaClass.kt          |  36 ++--
 .../kodiak/java/models}/JavaConstructor.kt    |  11 +-
 .../kodiak/java/models}/JavaEnumConstant.kt   |   2 +-
 .../kodiak/java/models}/JavaField.kt          |   6 +-
 .../kodiak/java/models}/JavaMethod.kt         |  13 +-
 .../kodiak/java/models}/JavaModuleDoc.kt      |  10 +-
 .../kodiak/java/models}/JavaPackage.kt        |  30 +--
 .../kodiak/java/models}/JavaParameter.kt      |   2 +-
 .../kodiak/java/models}/JavaReturnType.kt     |   2 +-
 javadoc/javadoc-runner/build.gradle.kts       |  23 ++-
 .../kotlin/{lib.kt => JavadocInvokerImpl.kt}  |  17 +-
 .../src/test/kotlin/JavadocJsonRunnerTest.kt  |  26 +--
 settings.gradle.kts                           |  17 ++
 swiftdoc/README.md                            |  47 -----
 swiftdoc/swiftdoc-formatter/build.gradle.kts  |  20 +-
 .../src/main/kotlin/SourcekittenWrapper.kt    |   5 +-
 .../src/main/kotlin/SwiftdocFileParser.kt     |  12 +-
 .../src/main/kotlin/SwiftdocRemapper.kt       |  39 ++--
 .../src/main/kotlin/formatter/formatClass.kt  |  40 +++-
 .../main/kotlin/formatter/formatExtension.kt  |  14 +-
 .../main/kotlin/formatter/formatFunction.kt   |   6 +-
 .../main/kotlin/formatter/formatHelpers.kt    |   4 +-
 .../kotlin/formatter/formatInitializer.kt     |   4 +-
 .../main/kotlin/formatter/formatSourceFile.kt |  14 +-
 .../main/kotlin/formatter/formatTypealias.kt  |   4 +-
 .../models/SourceKittenParseResult.kt         |  12 +-
 .../models/SourceKittenSubstructure.kt        |   4 +-
 .../internal/models/SwiftAccessibility.kt     |  12 +-
 .../internal/models/SwiftSubstructureKind.kt  |  95 ++++-----
 .../src/main/kotlin/main.kt                   |  17 +-
 swiftdoc/swiftdoc-models/build.gradle.kts     |  12 +-
 .../src/main/kotlin/SwiftClass.kt             |  35 ++--
 .../src/main/kotlin/SwiftConstructor.kt       |  11 +-
 .../src/main/kotlin/SwiftExtension.kt         |  13 +-
 .../src/main/kotlin/SwiftField.kt             |   7 +-
 .../src/main/kotlin/SwiftMethod.kt            |  13 +-
 .../src/main/kotlin/SwiftModuleDoc.kt         |  10 +-
 .../src/main/kotlin/SwiftSourceFile.kt        |  37 ++--
 swiftdoc/swiftdoc-runner/build.gradle.kts     |  22 +-
 .../kotlin/{lib.kt => SwiftdocInvokerImpl.kt} |  16 +-
 .../src/test/kotlin/SwiftdocJsonRunnerTest.kt |  24 +--
 178 files changed, 2264 insertions(+), 1980 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .github/workflows/pr_master.yml
 create mode 100644 .github/workflows/push_dev.yml
 create mode 100644 .github/workflows/push_docs.yml
 create mode 100644 .github/workflows/push_master.yml
 create mode 100644 CHANGELOG.md
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 buildSrc/settings.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/Config.kt
 delete mode 100644 buildSrc/src/main/kotlin/Libs.kt
 create mode 100644 buildSrc/src/main/kotlin/Utils.kt
 delete mode 100644 buildSrc/src/main/kotlin/Versions.kt
 create mode 100644 buildSrc/src/main/kotlin/copper-leaf-base.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/copper-leaf-lint.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/copper-leaf-publish.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/copper-leaf-shadow.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/copper-leaf-version.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/kodiak-formatters.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/kodiak-models.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/kodiak-runners.gradle.kts
 delete mode 100644 common/common-models/src/test/kotlin/RichTextComponentTest.kt
 rename common/common-models/src/test/kotlin/{ => com/copperleaf/kodiak/common}/AutoDocumentTest.kt (90%)
 rename common/common-models/src/test/kotlin/{ => com/copperleaf/kodiak/common}/CommentTagTest.kt (54%)
 create mode 100644 common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/RichTextComponentTest.kt
 delete mode 100644 common/common-runner/build.gradle
 create mode 100644 common/common-runner/build.gradle.kts
 delete mode 100644 docs/src/orchid/resources/404.peb
 delete mode 100644 docs/src/orchid/resources/assets/media/theme-logo.png
 delete mode 100644 docs/src/orchid/resources/assets/media/undraw_page_not_found.svg
 delete mode 100644 docs/src/orchid/resources/config/kotlindoc.yml
 delete mode 100644 docs/src/orchid/resources/templates/includes/footer.peb
 delete mode 100644 docs/src/orchid/resources/templates/layouts/base/sidebarBase.peb
 delete mode 100644 docs/src/orchid/resources/templates/pages/sourceDocModuleHomepage.peb
 delete mode 100644 docs/src/orchid/resources/wiki/page-one.md
 delete mode 100644 docs/src/orchid/resources/wiki/summary.md
 delete mode 100644 dokka/README.md
 rename dokka/dokka-runner/src/main/kotlin/{lib.kt => KotlindocInvokerImpl.kt} (78%)
 create mode 100644 gradle.properties
 delete mode 100644 gradle/actions/publish.gradle
 delete mode 100644 gradle/actions/shadow.gradle
 delete mode 100644 gradle/groups/formatters.gradle
 delete mode 100644 gradle/groups/models.gradle
 delete mode 100644 gradle/groups/runners.gradle
 delete mode 100644 groovydoc/README.md
 rename groovydoc/groovydoc-formatter/src/main/kotlin/{GroovydocJsonTool.kt => GroovyDocJsonTool.kt} (80%)
 rename groovydoc/groovydoc-runner/src/main/kotlin/{lib.kt => GroovydocInvokerImpl.kt} (75%)
 delete mode 100644 javadoc/README.md
 delete mode 100644 javadoc/javadoc-formatter/build.gradle
 create mode 100644 javadoc/javadoc-formatter/build.gradle.kts
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaClass.kt (63%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaConstructor.kt (82%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaEnumConstant.kt (100%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaField.kt (91%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaMethod.kt (81%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaModuleDoc.kt (70%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaPackage.kt (63%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaParameter.kt (100%)
 rename javadoc/javadoc-models/src/main/kotlin/{ => com/copperleaf/kodiak/java/models}/JavaReturnType.kt (100%)
 rename javadoc/javadoc-runner/src/main/kotlin/{lib.kt => JavadocInvokerImpl.kt} (75%)
 delete mode 100644 swiftdoc/README.md
 rename swiftdoc/swiftdoc-runner/src/main/kotlin/{lib.kt => SwiftdocInvokerImpl.kt} (72%)

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a86d6c8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*.{kt,kts}]
+insert_final_newline=true
+max_line_length=120
+disabled_rules=no-wildcard-imports,import-ordering
diff --git a/.github/workflows/pr_master.yml b/.github/workflows/pr_master.yml
new file mode 100644
index 0000000..6361d6c
--- /dev/null
+++ b/.github/workflows/pr_master.yml
@@ -0,0 +1,56 @@
+# On PRs to master, run tests on all supported platforms. Also do a dry publish of Orchid to validate its publishing
+# pipeline is configured correctly and changelog entries are present
+
+name: 'PR to `master` (Verify Release)'
+
+on:
+  pull_request:
+    branches: ['master']
+
+jobs:
+  buildCachesOnAll:
+    strategy:
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Build on ${{ matrix.os }} JDK 8'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK 8'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: 8
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Assemble with Gradle'
+        run: './gradlew assemble --no-daemon --stacktrace -Prelease'
+  testOnAll:
+    needs: ['buildCachesOnAll']
+    strategy:
+      matrix:
+        java: [8, 9, 10, 11, 12, 13, 14, 15, 16]
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK ${{ matrix.java }}'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: '${{ matrix.java }}'
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Run checks with Gradle'
+        run: './gradlew check :docs:publish --no-daemon --stacktrace -Prelease -PorchidEnvironment=prod -PorchidDryDeploy=true -PorchidDiagnose=true'
diff --git a/.github/workflows/push_dev.yml b/.github/workflows/push_dev.yml
new file mode 100644
index 0000000..be5c97a
--- /dev/null
+++ b/.github/workflows/push_dev.yml
@@ -0,0 +1,57 @@
+# On pushes to dev, or PRs to master or dev, run tests on all supported platforms
+
+name: 'Push/PR to `dev` (Verify Integration)'
+
+on:
+  push:
+    branches: ['dev']
+  pull_request:
+    branches: ['dev']
+
+jobs:
+  buildCachesOnAll:
+    strategy:
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Build on ${{ matrix.os }} JDK 8'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK 8'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: 8
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Assemble with Gradle'
+        run: './gradlew assemble --no-daemon --stacktrace'
+  testOnAll:
+    needs: ['buildCachesOnAll']
+    strategy:
+      matrix:
+        java: [8, 9, 10, 11, 12, 13, 14, 15, 16]
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK ${{ matrix.java }}'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: '${{ matrix.java }}'
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Run checks with Gradle'
+        run: './gradlew check --no-daemon --stacktrace'
diff --git a/.github/workflows/push_docs.yml b/.github/workflows/push_docs.yml
new file mode 100644
index 0000000..34a0e68
--- /dev/null
+++ b/.github/workflows/push_docs.yml
@@ -0,0 +1,30 @@
+# On pushes to `docs` branch, build and publish the Orchid documentation site
+
+name: 'Push to `docs` (Update Docs Site)'
+
+on:
+  push:
+    branches: ['docs']
+
+jobs:
+  publishOnMacOs:
+    runs-on: 'macos-latest'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK 1.8'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: 8
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Publish Orchid site'
+        run: './gradlew assemble :docs:publish --no-daemon --stacktrace'
+        env:
+          GITHUB_ACTOR: '${{ github.actor }}'
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.github/workflows/push_master.yml b/.github/workflows/push_master.yml
new file mode 100644
index 0000000..46836d1
--- /dev/null
+++ b/.github/workflows/push_master.yml
@@ -0,0 +1,84 @@
+# On pushes to master, run tests on all supported platforms. If all tests pass, then publish release artifacts and
+# update Orchid documentation site.
+
+name: 'Push to `master` (Create Release)'
+
+on:
+  push:
+    branches: ['master']
+
+jobs:
+  buildCachesOnAll:
+    strategy:
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Build on ${{ matrix.os }} JDK 8'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK 8'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: 8
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Assemble with Gradle'
+        run: './gradlew assemble --no-daemon --stacktrace -Prelease -PorchidEnvironment=prod'
+  testOnAll:
+    needs: ['buildCachesOnAll']
+    strategy:
+      matrix:
+        java: [8, 9, 10, 11, 12, 13, 14, 15, 16]
+        os: ['ubuntu-latest', 'macos-latest']
+    name: 'Test on ${{ matrix.os }} JDK ${{ matrix.java }}'
+    runs-on: '${{ matrix.os }}'
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK ${{ matrix.java }}'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: '${{ matrix.java }}'
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Run checks with Gradle'
+        run: './gradlew check --no-daemon --stacktrace -Prelease -PorchidEnvironment=prod'
+  publishOnMacOs:
+    runs-on: 'macos-latest'
+    needs: ['testOnAll']
+    steps:
+      - uses: 'actions/checkout@v2'
+      - run: 'git fetch --prune --unshallow --tags'
+      - name: 'Set up JDK 1.8'
+        uses: 'actions/setup-java@v2'
+        with:
+          distribution: 'adopt'
+          java-version: 8
+      - name: 'Cache Gradle packages'
+        uses: 'actions/cache@v1'
+        with:
+          path: '~/.gradle/caches'
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: '${{ runner.os }}-gradle'
+      - name: 'Publish to GitHub Packages'
+        run: './gradlew publish --no-daemon --stacktrace -Prelease -PorchidEnvironment=prod'
+        env:
+          GITHUB_ACTOR: '${{ github.actor }}'
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          OSSRH_USERNAME: '${{ secrets.OSSRH_USERNAME }}'
+          OSSRH_PASSWORD: '${{ secrets.OSSRH_PASSWORD }}'
+          SIGNING_KEY_ID: '${{ secrets.SIGNING_KEY_ID }}'
+          SIGNING_KEY: '${{ secrets.SIGNING_KEY }}'
+          SIGNING_PASSWORD: '${{ secrets.SIGNING_PASSWORD }}'
+
diff --git a/.gitignore b/.gitignore
index 26f688d..3fef02a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,82 @@
-# Files for the ART/Dalvik VM
-*.dex
+### https://raw.github.com/github/gitignore/7792e50daeaa6c07460484704671d1dc9f0045a7/Java.gitignore
 
-# Java class files
+# Compiled class file
 *.class
 
-# Generated files
-bin/
-gen/
-out/
+# Log file
+*.log
 
-# Gradle files
-.gradle/
-build/
-/classes/
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
 
-# Local configuration file (sdk path, etc)
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+*.hprof
+
+### https://raw.github.com/github/gitignore/7792e50daeaa6c07460484704671d1dc9f0045a7/Global/Eclipse.gitignore
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
 local.properties
+.settings/
+.loadpath
+.recommenders
 
-# Proguard folder generated by Eclipse
-proguard/
+# External tool builders
+.externalToolBuilders/
 
-# Log Files
-*.log
+# Locally stored "Eclipse launch configurations"
+*.launch
 
-# Intellij
-*.iml
-.idea/
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
 
-# Keystore files
-*.jks
+# CDT-specific (C/C++ Development Tooling)
+.cproject
 
-# Google Analytics
-/**/templates/meta.*
+# Java annotation processor (APT)
+.factorypath
 
-.DS_Store
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
 
-!swiftdoc/swiftdoc-formatter/src/main/resources/bin
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+.idea/
+.gradle/
+build/
+*.iml
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..6b11777
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 1.0.0 - 2021-04-15
+
+- Updates all to kotlin 1.4.32
diff --git a/LICENSE.md b/LICENSE.md
index 342e12a..416d93b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,21 +1,21 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Copper Leaf
+Copyright (c) 2021, Copper Leaf
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/README.md b/README.md
index c1735c3..3ef1c79 100644
--- a/README.md
+++ b/README.md
@@ -1,126 +1,52 @@
 # Kodiak
 
-A collection of wrappers around various code documentation tools which produces a common JSON output readable by Orchid.
+> A collection of wrappers around various code documentation tools which produces a common JSON output readable by Orchid.
 
-## What is this?
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/copper-leaf/kodiak)
+![Maven Central](https://img.shields.io/maven-central/v/io.github.copper-leaf/kodiak-core)
+![Kotlin Version](https://img.shields.io/badge/Kotlin-1.4.32-orange)
 
-Most code documentation tools work by generating an HTML site. They have to do a lot of work to format navigate the 
-code's internal structure, and then create a website that very often, looks quite awful. It would be better for everyone
-if the language designers only needed to produce a code model, and then let someone else do the hard work of turning 
-that model into a website.
+# Supported Platforms/Features
 
-[Orchid](https://orchid.netlify.com/) is that tool that creates a beautiful website for your code docs. This project is
-the other side of that coin which produces a model that Orchid can use to generate those sites. 
+| Target Language | Documentation Tool |
+| --------------- | ------------------ |
+| Java            | Javadoc            |
+| Kotlin          | Dokka              |
+| Groovy          | Groovydoc          |
+| Swift           | SourceKitten       |
 
-### Short-Term Goal
+# Installation
 
-In the short-term, this project contains a series of formatters for various languages, which each can be mapped to a 
-specific Orchid plugin. 
-
-### Mid-Term Goal
-
-In the mid-term, this project will create a common interface to the code models created by all the individual language
-formatters. Orchid will then be updated to read from this common model, rather than the specific language models. This 
-will aid in maintainability, and also make it easier for Orchid to support new languages in the future. 
-
-### Long-Term Goal
-
-In the long-term, this project will not only create formatters for individual languages, but also create a 
-_specification_ for that code documentation model so that any tool can generate JSON matching that specification and 
-Orchid will be able to read it. This project will then create and document that specification and provide several tools
-which conform to that spec, but other tools are free to create their own implementations, and Orchid will use it just
-the same. 
-
-## Project Structure
-
-Each language in this project contains 3 individual projects, as follows:
-
-- `{language}/{language}-models`
-- `{language}/{language}-formatter`
-- `{language}/{language}-runner`
-
-These packages are related like so:
-
-- `-formatter` contains a compile dependency on `-models`, and is compiled as a fat jar
-- `-runner` contains a compile dependency on `-models`, and is used like a library. It also embeds the `-formatter` fat 
-    jar in its project resources. 
-- `-models` only contains model classes and functions to serialize/deserialize them
-
-The `-formatter` project is a fat jar, embedding all of its dependencies and runtimes needed to run. It's role is to run
-some task which will produce a code model in JSON format using the `-models` format, written to files on disk. It is 
-designed to be run completely in isolation, as a CLI tool or started from another process.
-
-The `-runner` project is a lightweight wrapper around the `-formatter` project. It embeds the `-formatter` fat jar in 
-its resources, and when requested will cache that jar to the local filesystem and run it as a separate process. It will
-then use the same `-models` project to read the written JSON files and return them as a model to the application calling
-this library.
-
-The `-models` project uses Kotlinx serialization to create an interface between the `-formatter` and `-runner` projects.
-It should contain no logic, and just creates the language-specific models.
-
-## Usage
-
-The general usage for any of these formatters looks like like the following. See the 
-[official docs](https://copper-leaf.github.io/kodiak) for specifics for each language.
-
-1) Include the `-runner` dependency in your app:
-
-```groovy
+```kotlin
 repositories {
-    jcenter()
+    mavenCentral()
 }
+
+// for plain JVM or Android projects
 dependencies {
-    compile 'com.eden:{language}-runner:{latest version}'
+    implementation("io.github.copper-leaf:kodiak-core:{{site.version}}")
 }
-```
-
-2) Call the wrapper library and get back the code model. The formatter will run synchronously; for async work you will 
-    need to start and run it all on a background thread.
 
-```kotlin
-// create the runner, and give it a cache directory
-var cacheDir: Path = Files.createTempDirectory("cacheDir")
-val runner: {language}Invoker = {language}InvokerImpl(cacheDir)
-
-// create the output directory, and make sure to clear it between runs
-val outputDir = File("outputDir").canonicalFile.toPath()
-outputDir.toFile().deleteRecursively()
-outputDir.toFile().mkdirs()
-
-// run the formatter, and get back a documentation model
-val rootDoc = runner.getRootDoc(
-    listOf( // set one or more directories containing source code files
-        File("sourceDir1").canonicalFile.toPath(),
-        File("sourceDir2").canonicalFile.toPath()
-    ),
-    outputDir // tell it where to write the results
-) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) } // handle STDOUT streams from the external process
-
-// do whatever you want with the model
+// for multiplatform projects
+kotlin {
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation("io.github.copper-leaf:kodiak-core:{{site.version}}")
+            }
+        }
+    }
+}
 ```
 
-## Build and Test
-
-Each project is set up such that running `build` on the `-runner` project of each language will build and check 
-complete functionality for that language's formatter.
+# Documentation
 
-- `./gradlew clean :javadoc:javadoc-runner:build`
-- `./gradlew clean :dokka:dokka-runner:build`
-- `./gradlew clean :groovydoc:groovydoc-runner:build`
+See the [website](https://copper-leaf.github.io/kodiak/) for detailed documentation and usage instructions.
 
-Test source files for each language should go in the appropriate `-formatter` `test/` sourceroot. 
+# License 
 
-- `:javadoc:javadoc-runner` tests sources from:
-    - `javadoc/javadoc-formatter/src/example/java`
-- `:dokka:dokka-runner` tests sources from:
-    - `javadoc/javadoc-formatter/src/example/java`
-    - `dokka/dokka-formatter/src/example/kotlin`
-- `:groovydoc:groovydoc-runner` tests sources from:
-    - `javadoc/javadoc-formatter/src/example/java`
-    - `groovydoc/groovydoc-formatter/src/example/groovy`
-- `:swiftdoc:swiftdoc-runner` tests sources from:
-    - `swiftdoc/swiftdoc-formatter/src/example/swift`
+kodiak is licensed under the BSD 3-Clause License, see [LICENSE.md](https://github.com/copper-leaf/kodiak/tree/master/LICENSE.md). 
 
-To build and serve docs locally:
+# References
 
-- `./gradlew :docs:orchidServe`
+- [SRML](https://github.com/jasonwyatt/SRML)
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index a0a29f2..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://kotlin.bintray.com/kotlinx" }
-    }
-
-    dependencies {
-        classpath(Libs.kotlin_gradle_plugin)
-        classpath(Libs.kotlin_serialization)
-        classpath(Libs.shadow)
-        classpath(Libs.gradle_bintray_plugin)
-        classpath(Libs.buildsrcversions)
-        classpath("de.undercouch:gradle-download-task:4.0.2")
-    }
-}
-
-apply plugin: "de.fayard.buildSrcVersions"
-apply plugin: "de.undercouch.download"
-
-group "com.eden.kodiak"
-version "0.5.1"
-
-// Config Values
-//----------------------------------------------------------------------------------------------------------------------
-
-ext.ossLicenses = [
-        "BSD" : [
-                name: "BSD 3-Clause",
-                url : "https://opensource.org/licenses/BSD-3-Clause"
-        ]
-]
-
-ext {
-    github_project = "copper-leaf/kodiak"
-
-    // Bintray uploads
-    dry_deploy = project.hasProperty("dryDeploy")
-    bintray_username = "${project.properties["bintray_username"]}"
-    bintray_api_key = "${project.properties["bintray_apiKey"]}"
-    bintray_repo = "Eden"
-    bintray_user_org = "javaeden"
-
-    maven_central_sync = project.hasProperty("includeMavenCentralSync")
-    maven_central_username = "${project.properties['mavenCentral_username']}"
-    maven_central_password = "${project.properties['mavenCentral_password']}"
-
-    // Developer info
-    developer_id = 'JavaEden'
-    developer_name = 'Casey Brooks'
-    developer_email = 'cjbrooks12@gmail.com'
-
-    // Project info
-    project_name = 'Kodiak'
-    project_description = 'Wrappers around code documentation CLI tools to produce JSON models, usable as libraries'
-
-    license = rootProject.ext.ossLicenses['BSD']
-}
-
-wrapper {
-    gradleVersion = Versions.gradleLatestVersion
-    distributionType = Wrapper.DistributionType.ALL
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..c3c8802
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,5 @@
+
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5c46ddb..7f1de82 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,18 @@
-
 plugins {
     `kotlin-dsl`
 }
+
 repositories {
-    jcenter()
+    gradlePluginPortal()
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.android.tools.build:gradle:4.1.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
+    implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0")
+    implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.32")
+    implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+    implementation("de.undercouch:gradle-download-task:4.0.2")
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 0000000..29744ec
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "buildSrc"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
new file mode 100644
index 0000000..d82a06f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -0,0 +1,14 @@
+import org.gradle.api.JavaVersion
+
+object Config {
+    val groupId = "io.github.copper-leaf"
+    val githubUrl = "https://github.com/copper-leaf/kodiak"
+    val license = License.BSD3
+    val javaVersion = JavaVersion.VERSION_1_8.toString()
+
+    object Developer {
+        val id = "cjbrooks12"
+        val name = "Casey Brooks"
+        val email = "cjbrooks12@gmail.com"
+    }
+}
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
deleted file mode 100644
index 2b0108c..0000000
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Generated by https://github.com/jmfayard/buildSrcVersions
- *
- * Update this file with
- *   `$ ./gradlew buildSrcVersions`
- */
-object Libs {
-  const val com_eden_orchidplugin_gradle_plugin: String =
-      "com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin:" +
-      Versions.com_eden_orchidplugin_gradle_plugin
-
-  /**
-   * https://javaeden.github.io/Clog/Clog4j
-   */
-  const val clog4j: String = "com.eden:Clog4j:" + Versions.clog4j
-
-  /**
-   * https://javaeden.github.io/Common/Common
-   */
-  const val com_eden_common: String = "com.eden:Common:" + Versions.com_eden_common
-
-  const val shadow: String = "com.github.jengelman.gradle.plugins:shadow:" + Versions.shadow
-
-  const val gradle_bintray_plugin: String = "com.jfrog.bintray.gradle:gradle-bintray-plugin:" +
-      Versions.gradle_bintray_plugin
-
-  const val buildsrcversions: String = "de.fayard:buildSrcVersions:" + Versions.buildsrcversions
-
-  /**
-   * https://javaeden.github.io/Orchid/latest/core/
-   */
-  const val orchidcopper: String = "io.github.javaeden.orchid:OrchidCopper:" +
-      Versions.io_github_javaeden_orchid
-
-  /**
-   * https://javaeden.github.io/Orchid/latest/core/
-   */
-  const val orchiddocs: String = "io.github.javaeden.orchid:OrchidDocs:" +
-      Versions.io_github_javaeden_orchid
-
-  /**
-   * https://javaeden.github.io/Orchid/latest/core/
-   */
-  const val orchidgithub: String = "io.github.javaeden.orchid:OrchidGithub:" +
-      Versions.io_github_javaeden_orchid
-
-  const val orchidkotlindoc: String = "io.github.javaeden.orchid:OrchidKotlindoc:" +
-          Versions.io_github_javaeden_orchid
-
-  /**
-   * https://javaeden.github.io/Orchid/latest/core/
-   */
-  const val orchidplugindocs: String = "io.github.javaeden.orchid:OrchidPluginDocs:" +
-      Versions.io_github_javaeden_orchid
-
-  /**
-   * https://strikt.io/
-   */
-  const val strikt_core: String = "io.strikt:strikt-core:" + Versions.strikt_core
-
-  /**
-   * https://groovy-lang.org
-   */
-  const val groovy_all: String = "org.codehaus.groovy:groovy-all:" + Versions.groovy_all
-
-  const val dokka_fatjar: String = "org.jetbrains.dokka:dokka-fatjar:" +
-      Versions.org_jetbrains_dokka
-
-  const val org_jetbrains_dokka_gradle_plugin: String =
-      "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:" + Versions.org_jetbrains_dokka
-
-  const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
-      Versions.org_jetbrains_kotlin
-
-  /**
-   * https://kotlinlang.org/
-   */
-  const val kotlin_reflect: String = "org.jetbrains.kotlin:kotlin-reflect:" +
-      Versions.org_jetbrains_kotlin
-
-  /**
-   * https://kotlinlang.org/
-   */
-  const val kotlin_scripting_compiler_embeddable: String =
-      "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
-
-  /**
-   * https://kotlinlang.org/
-   */
-  const val kotlin_serialization_unshaded: String =
-      "org.jetbrains.kotlin:kotlin-serialization-unshaded:" + Versions.org_jetbrains_kotlin
-
-  /**
-   * https://kotlinlang.org/
-   */
-  const val kotlin_serialization: String = "org.jetbrains.kotlin:kotlin-serialization:" +
-      Versions.org_jetbrains_kotlin
-
-  /**
-   * https://kotlinlang.org/
-   */
-  const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" +
-      Versions.org_jetbrains_kotlin
-
-  /**
-   * https://github.com/Kotlin/kotlinx.serialization
-   */
-  const val kotlinx_serialization_runtime: String =
-      "org.jetbrains.kotlinx:kotlinx-serialization-runtime:" +
-      Versions.kotlinx_serialization_runtime
-
-  /**
-   * https://jsoup.org/
-   */
-  const val jsoup: String = "org.jsoup:jsoup:" + Versions.jsoup
-
-  /**
-   * https://junit.org/junit5/
-   */
-  const val junit_jupiter_api: String = "org.junit.jupiter:junit-jupiter-api:" +
-      Versions.org_junit_jupiter
-
-  /**
-   * https://junit.org/junit5/
-   */
-  const val junit_jupiter_engine: String = "org.junit.jupiter:junit-jupiter-engine:" +
-      Versions.org_junit_jupiter
-}
diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt
new file mode 100644
index 0000000..3220894
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Utils.kt
@@ -0,0 +1,176 @@
+import org.gradle.api.Project
+import java.io.ByteArrayOutputStream
+
+data class License(
+    val name: String,
+    val url: String
+) {
+    companion object {
+        val BSD3 = License("BSD-3-Clause", "https://opensource.org/licenses/BSD-3-Clause")
+    }
+}
+
+fun Project.loadProperty(
+    projectPropertyName: String,
+    envName: String = projectPropertyName.toUpperCase()
+): String {
+    val envValue = System.getenv(envName)?.toString()
+    if (envValue != null) return envValue
+
+    val projectPropertiesValue = project.properties[projectPropertyName]?.toString()
+    if (projectPropertiesValue != null) return projectPropertiesValue
+
+    return ""
+}
+
+fun Project.loadFileContents(
+    projectPropertyName: String,
+    envName: String = projectPropertyName.toUpperCase()
+): String {
+    val decodeIfNeeded: (String) -> String = {
+        if(it.startsWith("~/")) {
+            // the value is a path to file on disk. Read its contents
+            val filePath = it.replace("~/", System.getProperty("user.home") + "/")
+            project.file(filePath).readText()
+        }
+        else {
+            // the value itself is the file contents file
+            it
+        }
+    }
+
+    val envValue = System.getenv(envName)?.toString()
+    if (envValue != null) return decodeIfNeeded(envValue)
+
+    val projectPropertiesValue = project.properties[projectPropertyName]?.toString()
+    if (projectPropertiesValue != null) return decodeIfNeeded(projectPropertiesValue)
+
+    return ""
+}
+
+fun Project.runCommand(command: String): String {
+    return runCatching {
+        val stdout = ByteArrayOutputStream()
+
+        exec {
+            commandLine(*command.split(' ').toTypedArray())
+            standardOutput = stdout
+        }
+
+        stdout.toString().trim()
+    }.getOrElse { "" }
+}
+
+// Versioning Utils
+// ---------------------------------------------------------------------------------------------------------------------
+
+fun Project.getCurrentSha(): String = runCommand("git rev-parse HEAD")
+fun Project.getLatestTagSha(): String = runCommand("git rev-list --tags --max-count=1")
+fun Project.getLatestTagName(): String = runCommand("git describe --abbrev=0 --tags")
+fun Project.getCommitsSinceLastTag(latestTagName: String): List<String> = runCommand("git log ${latestTagName}..HEAD --oneline --pretty=format:%s").lines().reversed()
+fun Project.hasUncommittedChanges(): Boolean = runCommand("git status --porcelain").isBlank()
+
+fun String.parseVersion(): Triple<Int, Int, Int> {
+    return this
+        .split('.')
+        .map { it.trim().toIntOrNull() ?: 0 }
+        .let { Triple(it.component1(), it.component2(), it.component3()) }
+}
+
+fun Project.getProjectVersion(
+    logChanges: Boolean = false,
+    failWithUncommittedChanges: Boolean = false,
+    failIfNotRelease: Boolean = false,
+    snapshotSuffix: String = "-SNAPSHOT",
+    initialVersion: String = "0.1.0",
+    majorVersionBumpCommitPrefix: String = "[major]",
+    minorVersionBumpCommitPrefix: String = "[minor]"
+): ProjectVersion {
+    val latestTagName = getLatestTagName()
+    val latestTagSha = getLatestTagSha()
+    val currentSha = getCurrentSha()
+    val commitsSinceLastTag = getCommitsSinceLastTag(latestTagName)
+    val isRelease = hasProperty("release")
+    val hasUncommittedChanges = hasUncommittedChanges()
+
+    val (major, minor, patch) = when {
+        latestTagName.isBlank() -> {
+            initialVersion.parseVersion()
+        }
+        else -> {
+            var (_major, _minor, _patch) = latestTagName.parseVersion()
+
+            if (currentSha != latestTagSha || hasUncommittedChanges) {
+                _patch++
+            }
+
+            for (commit in commitsSinceLastTag) {
+                if (commit.startsWith(minorVersionBumpCommitPrefix)) {
+                    _patch = 0
+                    _minor++
+                } else if (commit.startsWith(majorVersionBumpCommitPrefix)) {
+                    _patch = 0
+                    _minor = 0
+                    _major++
+                }
+            }
+
+            Triple(_major, _minor, _patch)
+        }
+    }
+
+    // make checks on version
+    if (failWithUncommittedChanges) {
+        check(!hasUncommittedChanges) { "There are uncommitted changes!" }
+    }
+    if (failIfNotRelease) {
+        check(isRelease) { "This is not a release build!" }
+    }
+
+    return ProjectVersion(
+        major = major,
+        minor = minor,
+        patch = patch,
+        snapshot = !isRelease,
+        snapshotSuffix = snapshotSuffix,
+        sha = currentSha,
+        commits = commitsSinceLastTag
+    ).also {
+        if (logChanges) {
+            println("$latestTagName ($latestTagSha) -> $it ($currentSha) \n  * " + commitsSinceLastTag.joinToString(separator = "\n  * "))
+        }
+    }
+}
+
+data class ProjectVersion(
+    val major: Int,
+    val minor: Int,
+    val patch: Int,
+    val snapshot: Boolean,
+    val snapshotSuffix: String,
+    val sha: String,
+    val commits: List<String>
+) {
+    val shortVersion: String = "$major.$minor"
+    val releaseVersion: String = "$major.$minor.$patch"
+    val fullVersion: String = "$releaseVersion${if (snapshot) snapshotSuffix else ""}"
+
+    override fun toString(): String = fullVersion
+
+    fun debug(): String {
+        return """
+            |ProjectVersion(
+            |    major=$major
+            |    minor=$minor
+            |    patch=$patch
+            |    snapshot=$snapshot
+            |    snapshotSuffix=$snapshotSuffix
+            |    sha=$sha
+            |    commits=$commits
+            |    shortVersion=$shortVersion
+            |    releaseVersion=$releaseVersion
+            |    fullVersion=$fullVersion
+            |)
+        """.trimMargin()
+    }
+}
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
deleted file mode 100644
index 474064a..0000000
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-import kotlin.String
-
-/**
- * Generated by https://github.com/jmfayard/buildSrcVersions
- *
- * Find which updates are available by running
- *     `$ ./gradlew buildSrcVersions`
- * This will only update the comments.
- *
- * YOU are responsible for updating manually the dependency version.
- */
-object Versions {
-  const val com_eden_orchidplugin_gradle_plugin: String = "0.17.1" // available: "0.17.4"
-
-  const val clog4j: String = "2.0.7"
-
-  const val com_eden_common: String = "1.11.4"
-
-  const val shadow: String = "5.1.0"
-
-  const val gradle_bintray_plugin: String = "1.8.4"
-
-  const val buildsrcversions: String = "0.4.2"
-
-  const val io_github_javaeden_orchid: String = "0.20.0"
-
-  const val strikt_core: String = "0.21.1"
-
-  const val groovy_all: String = "2.5.8"
-
-  const val org_jetbrains_dokka: String = "0.9.18"
-
-  const val org_jetbrains_kotlin: String = "1.3.50"
-
-  const val kotlinx_serialization_runtime: String = "0.12.0"
-
-  const val jsoup: String = "1.12.1"
-
-  const val org_junit_jupiter: String = "5.5.1"
-
-  /**
-   *
-   * See issue 19: How to update Gradle itself?
-   * https://github.com/jmfayard/buildSrcVersions/issues/19
-   */
-  const val gradleLatestVersion: String = "5.6.1"
-
-  const val gradleCurrentVersion: String = "5.6"
-}
diff --git a/buildSrc/src/main/kotlin/copper-leaf-base.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-base.gradle.kts
new file mode 100644
index 0000000..de735df
--- /dev/null
+++ b/buildSrc/src/main/kotlin/copper-leaf-base.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    base
+}
+
+repositories {
+    mavenCentral()
+    google()
+}
+
+group = Config.groupId
+
+var ghUser: String by project.extra
+var ghToken: String by project.extra
+var jetbrainsSpaceUser: String by project.extra
+var jetbrainsSpaceToken: String by project.extra
+
+ghUser              = loadProperty("githubUsername", "GITHUB_ACTOR")
+ghToken             = loadProperty("githubToken", "GITHUB_TOKEN")
+jetbrainsSpaceUser  = loadProperty("jetbrainsSpaceUser", "JETBRAINS_SPACE_USER")
+jetbrainsSpaceToken = loadProperty("jetbrainsSpaceToken", "JETBRAINS_SPACE_TOKEN")
diff --git a/buildSrc/src/main/kotlin/copper-leaf-lint.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-lint.gradle.kts
new file mode 100644
index 0000000..f47dca1
--- /dev/null
+++ b/buildSrc/src/main/kotlin/copper-leaf-lint.gradle.kts
@@ -0,0 +1,24 @@
+import org.gradle.kotlin.dsl.kotlin
+
+plugins {
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+ktlint {
+    debug.set(false)
+    verbose.set(true)
+    android.set(true)
+    outputToConsole.set(true)
+    ignoreFailures.set(false)
+    enableExperimentalRules.set(false)
+    additionalEditorconfigFile.set(file("$rootDir/.editorconfig"))
+    reporters {
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
+    }
+    filter {
+        exclude("**/generated/**")
+        include("**/kotlin/**")
+    }
+}
diff --git a/buildSrc/src/main/kotlin/copper-leaf-publish.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-publish.gradle.kts
new file mode 100644
index 0000000..a2d62f7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/copper-leaf-publish.gradle.kts
@@ -0,0 +1,87 @@
+plugins {
+    `maven-publish`
+    signing
+}
+
+// MavenCentral Signing and Publishing
+// ---------------------------------------------------------------------------------------------------------------------
+
+// taken and modified from https://dev.to/kotlin/how-to-build-and-publish-a-kotlin-multiplatform-library-going-public-4a8k
+
+// Stub secrets to let the project sync and build without the publication values set up
+var signingKeyId: String by project.extra
+var signingKey: String by project.extra
+var signingPassword: String by project.extra
+var ossrhUsername: String by project.extra
+var ossrhPassword: String by project.extra
+
+// Grabbing secrets from project properties or from environment variables, which could be used on CI
+signingKeyId = loadProperty("signing_key_id")
+signingKey = loadFileContents("signing_key")
+signingPassword = loadProperty("signing_password")
+ossrhUsername = loadProperty("ossrh_username")
+ossrhPassword = loadProperty("ossrh_password")
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+//val sourcesJar by tasks.registering(Jar::class) {
+
+publishing {
+    // Configure maven central repository
+    repositories {
+        // publish to the project buildDir to make sure things are getting published correctly
+        maven(url = "${project.buildDir}/.m2/repository") {
+            name = "project"
+        }
+        maven(url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
+            name = "mavenCentral"
+            credentials {
+                username = ossrhUsername
+                password = ossrhPassword
+            }
+        }
+    }
+
+    publications {
+        val mavenKotlin by creating(MavenPublication::class) {
+            from(project.components["java"])
+        }
+    }
+
+    // Configure all publications
+    publications.withType<MavenPublication> {
+
+        // Stub javadoc.jar artifact
+        artifact(javadocJar.get())
+
+        // Provide artifacts information requited by Maven Central
+        pom {
+            name.set(project.name)
+            description.set("${project.description}")
+            url.set(Config.githubUrl)
+
+            licenses {
+                license {
+                    name.set(Config.license.name)
+                    url.set(Config.license.url)
+                }
+            }
+            developers {
+                developer {
+                    id.set(Config.Developer.id)
+                    name.set(Config.Developer.name)
+                    email.set(Config.Developer.email)
+                }
+            }
+            scm {
+                url.set("${Config.githubUrl}.git")
+            }
+        }
+    }
+}
+
+signing {
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    sign(publishing.publications)
+}
diff --git a/buildSrc/src/main/kotlin/copper-leaf-shadow.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-shadow.gradle.kts
new file mode 100644
index 0000000..02d52f7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/copper-leaf-shadow.gradle.kts
@@ -0,0 +1,15 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+val shadowJar by tasks
+val assemble by tasks
+
+assemble.dependsOn(shadowJar)
+
+tasks.withType<ShadowJar> {
+    archiveVersion.set(project.version.toString())
+    archiveExtension.set("zip")
+}
diff --git a/buildSrc/src/main/kotlin/copper-leaf-version.gradle.kts b/buildSrc/src/main/kotlin/copper-leaf-version.gradle.kts
new file mode 100644
index 0000000..148a7d7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/copper-leaf-version.gradle.kts
@@ -0,0 +1,14 @@
+
+// Setup default project values
+//----------------------------------------------------------------------------------------------------------------------
+var projectVersion: ProjectVersion by project.extra
+var shortVersion: String by project.extra
+var releaseVersion: String by project.extra
+var fullVersion: String by project.extra
+
+projectVersion = getProjectVersion(logChanges = project === rootProject)
+shortVersion = projectVersion.shortVersion
+releaseVersion = projectVersion.releaseVersion
+fullVersion = projectVersion.fullVersion
+
+version = projectVersion
diff --git a/buildSrc/src/main/kotlin/kodiak-formatters.gradle.kts b/buildSrc/src/main/kotlin/kodiak-formatters.gradle.kts
new file mode 100644
index 0000000..52c558d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/kodiak-formatters.gradle.kts
@@ -0,0 +1,40 @@
+plugins {
+    java
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+}
+
+description = "Kodiak - Javadoc Models"
+
+java {
+    withSourcesJar()
+}
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+    api("io.github.copper-leaf:common-core:3.0.0")
+
+    api(project(":common:common-formatter"))
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
diff --git a/buildSrc/src/main/kotlin/kodiak-models.gradle.kts b/buildSrc/src/main/kotlin/kodiak-models.gradle.kts
new file mode 100644
index 0000000..3d4edd4
--- /dev/null
+++ b/buildSrc/src/main/kotlin/kodiak-models.gradle.kts
@@ -0,0 +1,37 @@
+plugins {
+    java
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+}
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+
+    api(project(":common:common-models"))
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+}
+
+java {
+    withSourcesJar()
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
diff --git a/buildSrc/src/main/kotlin/kodiak-runners.gradle.kts b/buildSrc/src/main/kotlin/kodiak-runners.gradle.kts
new file mode 100644
index 0000000..3803872
--- /dev/null
+++ b/buildSrc/src/main/kotlin/kodiak-runners.gradle.kts
@@ -0,0 +1,43 @@
+plugins {
+    java
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+}
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+
+    api(project(":common:common-models"))
+    api(project(":common:common-runner"))
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+    testApi("io.github.copper-leaf:common-core:3.0.0")
+}
+
+java {
+    withSourcesJar()
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    outputs.upToDateWhen { false }
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
+sourceSets {
+    create("example")
+}
diff --git a/common/common-formatter/build.gradle.kts b/common/common-formatter/build.gradle.kts
index ec84056..1fba012 100644
--- a/common/common-formatter/build.gradle.kts
+++ b/common/common-formatter/build.gradle.kts
@@ -1 +1,36 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/formatters.gradle")
+plugins {
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Common Formatter"
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
diff --git a/common/common-formatter/src/main/kotlin/utils.kt b/common/common-formatter/src/main/kotlin/utils.kt
index 71a4692..8722285 100644
--- a/common/common-formatter/src/main/kotlin/utils.kt
+++ b/common/common-formatter/src/main/kotlin/utils.kt
@@ -1,6 +1,6 @@
 package com.copperleaf.kodiak.common
 
-public inline fun <T> Iterable<T>.withEach(action: T.() -> Unit): Unit {
+public inline fun <T> Iterable<T>.withEach(action: T.() -> Unit) {
     for (element in this) element.action()
 }
 
diff --git a/common/common-models/build.gradle.kts b/common/common-models/build.gradle.kts
index 4f320f0..9d6df11 100644
--- a/common/common-models/build.gradle.kts
+++ b/common/common-models/build.gradle.kts
@@ -1 +1,36 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/models.gradle")
+plugins {
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Common Models"
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
diff --git a/common/common-models/src/main/kotlin/AutoDocument.kt b/common/common-models/src/main/kotlin/AutoDocument.kt
index c48ff5b..c5aab09 100644
--- a/common/common-models/src/main/kotlin/AutoDocument.kt
+++ b/common/common-models/src/main/kotlin/AutoDocument.kt
@@ -43,13 +43,19 @@ interface AutoDocumentNode {
 fun fromDoc(prop: KProperty<DocElement?>): AutoDocumentNode {
     return object : AutoDocumentNode {
         override val name: String = prop.name
-        override val elements by lazy { prop.getter.call()?.let { listOf(it) } ?: emptyList() }
+        override val elements: List<DocElement> by lazy {
+            val el: DocElement? = prop.getter.call()
+            listOfNotNull(el)
+        }
     }
 }
 
 fun fromDocList(prop: KProperty<List<DocElement>?>): AutoDocumentNode {
     return object : AutoDocumentNode {
         override val name: String = prop.name
-        override val elements by lazy { prop.getter.call() ?: emptyList() }
+        override val elements: List<DocElement> by lazy {
+            val els: List<DocElement>? = prop.getter.call()
+            els ?: emptyList()
+        }
     }
 }
diff --git a/common/common-models/src/main/kotlin/CommentTag.kt b/common/common-models/src/main/kotlin/CommentTag.kt
index b5a0f19..f4dcf30 100644
--- a/common/common-models/src/main/kotlin/CommentTag.kt
+++ b/common/common-models/src/main/kotlin/CommentTag.kt
@@ -30,6 +30,8 @@ data class CommentTag(
     val values: Map<String, List<RichTextComponent>>? = null
 ) {
     init {
-        check((value != null) xor (values != null)) { "A CommentTag must have a single value or a map of values, but not both!" }
+        check((value != null) xor (values != null)) {
+            "A CommentTag must have a single value or a map of values, but not both!"
+        }
     }
 }
diff --git a/common/common-models/src/main/kotlin/JsonableDocElement.kt b/common/common-models/src/main/kotlin/JsonableDocElement.kt
index 2115709..fb45faa 100644
--- a/common/common-models/src/main/kotlin/JsonableDocElement.kt
+++ b/common/common-models/src/main/kotlin/JsonableDocElement.kt
@@ -1,8 +1,10 @@
 package com.copperleaf.kodiak.common
 
+import kotlinx.serialization.json.Json
+
 /**
  * Indicates that this doc element can be serialized to JSON
  */
 interface JsonableDocElement : DocElement {
-    fun toJson(): String
-}
\ No newline at end of file
+    fun toJson(json: Json): String
+}
diff --git a/common/common-models/src/main/kotlin/SpecializedDocElement.kt b/common/common-models/src/main/kotlin/SpecializedDocElement.kt
index 7c2cf95..d987b56 100644
--- a/common/common-models/src/main/kotlin/SpecializedDocElement.kt
+++ b/common/common-models/src/main/kotlin/SpecializedDocElement.kt
@@ -7,4 +7,4 @@ interface SpecializedDocElement : DocElement {
      * help give additional information while keeping a uniform doc structure.
      */
     val subKind: String
-}
\ No newline at end of file
+}
diff --git a/common/common-models/src/test/kotlin/RichTextComponentTest.kt b/common/common-models/src/test/kotlin/RichTextComponentTest.kt
deleted file mode 100644
index 27f7dc0..0000000
--- a/common/common-models/src/test/kotlin/RichTextComponentTest.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-@file:UseExperimental(UnstableDefault::class)
-package com.copperleaf.kodiak.common
-
-import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.json.Json
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.assertions.isEqualTo
-import strikt.assertions.isNull
-
-class RichTextComponentTest {
-
-    @Test
-    fun testSerializerFor_RichTextComponent() {
-        val underTest = RichTextComponent(
-            kind = "testKind",
-            text = "testText",
-            value = "testValue"
-        )
-        val json = """
-            |{
-            |    "kind": "testKind",
-            |    "text": "testText",
-            |    "value": "testValue"
-            |}
-            """.trimMargin()
-
-        val serialized = Json.indented.stringify(RichTextComponent.serializer(), underTest)
-        expectThat(serialized).isEqualTo(json)
-
-        val parsed = Json.indented.parse(RichTextComponent.serializer(), json)
-        expectThat(parsed)
-            .and { get { kind }.isEqualTo("testKind") }
-            .and { get { text }.isEqualTo("testText") }
-            .and { get { value }.isEqualTo("testValue") }
-
-        expectThat(underTest).isEqualTo(parsed)
-    }
-
-    @Test
-    fun testSerializerFor_RichTextComponent_WithNullValue() {
-        val underTest = RichTextComponent(
-            kind = "testKind",
-            text = "testText",
-            value = null
-        )
-        val json = """
-            |{
-            |    "kind": "testKind",
-            |    "text": "testText",
-            |    "value": null
-            |}
-            """.trimMargin()
-
-        val serialized = Json.indented.stringify(RichTextComponent.serializer(), underTest)
-        expectThat(serialized).isEqualTo(json)
-
-        val parsed = Json.indented.parse(RichTextComponent.serializer(), json)
-        expectThat(parsed)
-            .and { get { kind }.isEqualTo("testKind") }
-            .and { get { text }.isEqualTo("testText") }
-            .and { get { value }.isNull() }
-
-        expectThat(underTest).isEqualTo(parsed)
-    }
-
-}
diff --git a/common/common-models/src/test/kotlin/AutoDocumentTest.kt b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/AutoDocumentTest.kt
similarity index 90%
rename from common/common-models/src/test/kotlin/AutoDocumentTest.kt
rename to common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/AutoDocumentTest.kt
index 651e159..ade1d7c 100644
--- a/common/common-models/src/test/kotlin/AutoDocumentTest.kt
+++ b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/AutoDocumentTest.kt
@@ -1,9 +1,9 @@
 package com.copperleaf.kodiak.common
 
-import com.caseyjbrooks.clog.Clog
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
+import clog.Clog
+import kotlin.test.BeforeTest
+import kotlin.test.Test
 
 class AutoDocumentTest {
 
@@ -12,7 +12,7 @@ class AutoDocumentTest {
     internal lateinit var typeParameters: List<DocElement>
     internal lateinit var returnValue: TestTypeElement
 
-    @BeforeEach
+    @BeforeTest
     internal fun setUp() {
         receiver = null
         parameters = listOf(
@@ -31,7 +31,7 @@ class AutoDocumentTest {
     }
 
 // Helpers
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     internal fun doc(
         kind: String,
@@ -86,7 +86,7 @@ class AutoDocumentTest {
 }
 
 // Setup as data class with overridden method supplying nodes
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
 interface AutoDocument {
     val nodes: List<AutoDocumentNode>
diff --git a/common/common-models/src/test/kotlin/CommentTagTest.kt b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/CommentTagTest.kt
similarity index 54%
rename from common/common-models/src/test/kotlin/CommentTagTest.kt
rename to common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/CommentTagTest.kt
index bcd2cfb..a63b581 100644
--- a/common/common-models/src/test/kotlin/CommentTagTest.kt
+++ b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/CommentTagTest.kt
@@ -1,22 +1,21 @@
-@file:UseExperimental(UnstableDefault::class)
 package com.copperleaf.kodiak.common
 
-import kotlinx.serialization.UnstableDefault
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.api.expectThrows
-import strikt.assertions.first
-import strikt.assertions.get
-import strikt.assertions.hasSize
-import strikt.assertions.isEqualTo
-import strikt.assertions.isNotNull
-import strikt.assertions.isNull
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 
 class CommentTagTest {
 
     @Test
     fun testSerializeCommentTag_singleValue() {
+        val jsonModule = Json {
+            prettyPrint = true
+            encodeDefaults = true
+        }
         val underTest = CommentTag(
             value = listOf(
                 RichTextComponent(
@@ -39,26 +38,28 @@ class CommentTagTest {
             |}
             """.trimMargin()
 
-        val serialized = Json.indented.stringify(CommentTag.serializer(), underTest)
-        expectThat(serialized).isEqualTo(json)
-
-        val parsed = Json.indented.parse(CommentTag.serializer(), json)
-        expectThat(parsed)
-            .and { get { values }.isNull() }
-            .and { get { value }
-                .isNotNull()
-                .hasSize(1)
-                .first()
-                .and { get { kind }.isEqualTo("testKind") }
-                .and { get { text }.isEqualTo("testText") }
-                .and { get { value }.isEqualTo("testValue") }
-            }
-
-        expectThat(underTest).isEqualTo(parsed)
+        val serialized = jsonModule.encodeToString(CommentTag.serializer(), underTest)
+        assertEquals(json, serialized)
+
+        val parsed = jsonModule.decodeFromString(CommentTag.serializer(), json)
+        assertNull(parsed.values)
+        assertNotNull(parsed.value)
+        assertEquals(1, parsed.value!!.size)
+
+        val first = parsed.value!!.first()
+        assertEquals("testKind", first.kind)
+        assertEquals("testText", first.text)
+        assertEquals("testValue", first.value)
+
+        assertEquals(underTest, parsed)
     }
 
     @Test
     fun testSerializeCommentTag_valueMap() {
+        val jsonModule = Json {
+            prettyPrint = true
+            encodeDefaults = true
+        }
         val underTest = CommentTag(
             values = mapOf(
                 "testKey" to listOf(
@@ -85,27 +86,24 @@ class CommentTagTest {
                 |}
                 """.trimMargin()
 
-        val serialized = Json.indented.stringify(CommentTag.serializer(), underTest)
-        expectThat(serialized).isEqualTo(json)
-
-        val parsed = Json.indented.parse(CommentTag.serializer(), json)
-        expectThat(parsed)
-            .and { get { value }.isNull() }
-            .and { get { values }
-                // has values
-                .isNotNull()
-                .hasSize(1)["testKey"]
-
-                // values.testKey is not empty
-                .isNotNull()
-                .hasSize(1)
-                .first()
-                .and { get { kind }.isEqualTo("testKind") }
-                .and { get { text }.isEqualTo("testText") }
-                .and { get { value }.isEqualTo("testValue") }
-            }
-
-        expectThat(underTest).isEqualTo(parsed)
+        val serialized = jsonModule.encodeToString(underTest)
+        assertEquals(json, serialized)
+
+        val parsed = jsonModule.decodeFromString(CommentTag.serializer(), json)
+        assertNull(parsed.value)
+        assertNotNull(parsed.values)
+        assertEquals(1, parsed.values!!.size)
+
+        val testKey = parsed.values!!["testKey"]
+        assertNotNull(testKey)
+        assertEquals(1, testKey.size)
+
+        val first = testKey.first()
+        assertEquals(first.kind, "testKind")
+        assertEquals(first.text, "testText")
+        assertEquals(first.value, "testValue")
+
+        assertEquals(underTest, parsed)
     }
 
     @Test
@@ -118,7 +116,7 @@ class CommentTagTest {
             )
         )
 
-        expectThrows<IllegalStateException> {
+        assertFailsWith<IllegalStateException> {
             CommentTag(
                 value = comment,
                 values = mapOf(
@@ -130,12 +128,11 @@ class CommentTagTest {
 
     @Test
     fun testSerializeCommentTag_neitherValueNorValues_throws() {
-        expectThrows<IllegalStateException> {
+        assertFailsWith<IllegalStateException> {
             CommentTag(
                 value = null,
                 values = null
             )
         }
     }
-
 }
diff --git a/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/RichTextComponentTest.kt b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/RichTextComponentTest.kt
new file mode 100644
index 0000000..3f86071
--- /dev/null
+++ b/common/common-models/src/test/kotlin/com/copperleaf/kodiak/common/RichTextComponentTest.kt
@@ -0,0 +1,72 @@
+package com.copperleaf.kodiak.common
+
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+class RichTextComponentTest {
+
+    @Test
+    fun testSerializerFor_RichTextComponent() {
+        val jsonModule = Json {
+            prettyPrint = true
+            encodeDefaults = true
+        }
+
+        val underTest = RichTextComponent(
+            kind = "testKind",
+            text = "testText",
+            value = "testValue"
+        )
+        val json = """
+            |{
+            |    "kind": "testKind",
+            |    "text": "testText",
+            |    "value": "testValue"
+            |}
+            """.trimMargin()
+
+        val serialized = jsonModule.encodeToString(underTest)
+        assertEquals(json, serialized)
+
+        val parsed = jsonModule.decodeFromString(RichTextComponent.serializer(), json)
+        assertEquals("testKind", parsed.kind)
+        assertEquals("testText", parsed.text)
+        assertEquals("testValue", parsed.value)
+
+        assertEquals(underTest, parsed)
+    }
+
+    @Test
+    fun testSerializerFor_RichTextComponent_WithNullValue() {
+        val jsonModule = Json {
+            prettyPrint = true
+            encodeDefaults = true
+        }
+
+        val underTest = RichTextComponent(
+            kind = "testKind",
+            text = "testText",
+            value = null
+        )
+        val json = """
+            |{
+            |    "kind": "testKind",
+            |    "text": "testText",
+            |    "value": null
+            |}
+            """.trimMargin()
+
+        val serialized = jsonModule.encodeToString(RichTextComponent.serializer(), underTest)
+        assertEquals(json, serialized)
+
+        val parsed = jsonModule.decodeFromString(RichTextComponent.serializer(), json)
+        assertEquals("testKind", parsed.kind)
+        assertEquals("testText", parsed.text)
+        assertNull(parsed.value)
+
+        assertEquals(underTest, parsed)
+    }
+}
diff --git a/common/common-runner/build.gradle b/common/common-runner/build.gradle
deleted file mode 100644
index 9ab56f4..0000000
--- a/common/common-runner/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-apply from: "${rootProject.rootDir}/gradle/groups/runners.gradle"
-
-task updateVersionLine {
-    doLast {
-        def regex = """
-// -- VERSION --
-const val version = ".*?"
-// -- ENDVERSION --
-"""
-        def replacement = """
-// -- VERSION --
-const val version = "${project.version}"
-// -- ENDVERSION --
-"""
-
-        def utilsFile = file("${project.projectDir}/src/main/kotlin/utils.kt")
-        utilsFile.text
-
-        utilsFile.write(utilsFile.text.replaceAll(regex, replacement))
-    }
-}
-tasks.compileJava.dependsOn(updateVersionLine)
diff --git a/common/common-runner/build.gradle.kts b/common/common-runner/build.gradle.kts
new file mode 100644
index 0000000..5592a06
--- /dev/null
+++ b/common/common-runner/build.gradle.kts
@@ -0,0 +1,61 @@
+plugins {
+    kotlin("jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Common Runner"
+
+dependencies {
+    api(kotlin("reflect"))
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
+    api("io.github.copper-leaf:clog-core:4.1.1")
+
+    api(project(":common:common-models"))
+
+    testApi(kotlin("test-common"))
+    testApi(kotlin("test-junit"))
+    testApi(kotlin("test-annotations-common"))
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = Config.javaVersion
+    targetCompatibility = Config.javaVersion
+}
+tasks.withType<Test> {
+    testLogging {
+        showStandardStreams = true
+    }
+}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.useIR = true
+    kotlinOptions {
+        jvmTarget = Config.javaVersion
+    }
+}
+
+val updateVersionLine by tasks.registering {
+    doLast {
+        val regex = """
+        |// -- VERSION --
+        |const val version = ".*?"
+        |// -- ENDVERSION --
+        """.trimMargin().toRegex()
+
+        val replacement = """
+        |// -- VERSION --
+        |const val version = "${project.version}"
+        |// -- ENDVERSION --
+        """.trimMargin()
+
+        val utilsFile = file("${project.projectDir}/src/main/kotlin/utils.kt")
+        utilsFile.writeText(
+            utilsFile.readText().replace(regex, replacement)
+        )
+    }
+}
+val compileJava by tasks
+compileJava.dependsOn(updateVersionLine)
diff --git a/common/common-runner/src/main/kotlin/BaseDocInvoker.kt b/common/common-runner/src/main/kotlin/BaseDocInvoker.kt
index 5499066..e6cb213 100644
--- a/common/common-runner/src/main/kotlin/BaseDocInvoker.kt
+++ b/common/common-runner/src/main/kotlin/BaseDocInvoker.kt
@@ -1,7 +1,6 @@
 package com.copperleaf.kodiak.common
 
 import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 import java.io.InputStream
 import java.nio.file.Files
@@ -42,7 +41,7 @@ abstract class BaseDocInvoker<T : ModuleDoc>(
     }
 
 // Run documentation runner
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     private fun cacheEmbeddedJar() {
         formatterJar.parent.toFile().mkdirs()
@@ -73,9 +72,8 @@ abstract class BaseDocInvoker<T : ModuleDoc>(
     }
 
 // Helper Functions
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
-    @UseExperimental(UnstableDefault::class)
     protected fun <T : Any> getDocsInSubdirectory(
         destinationDir: Path,
         subdirectory: String,
@@ -87,8 +85,7 @@ abstract class BaseDocInvoker<T : ModuleDoc>(
             .walkTopDown()
             .filter { it.isFile }
             .filter { it.exists() }
-            .mapNotNull { Json.parse(deserializer, it.readText()) }
+            .mapNotNull { Json.decodeFromString(deserializer, it.readText()) }
             .toList()
     }
-
 }
diff --git a/common/common-runner/src/main/kotlin/DocInvokerDescriptor.kt b/common/common-runner/src/main/kotlin/DocInvokerDescriptor.kt
index 3ae7b74..ed98bae 100644
--- a/common/common-runner/src/main/kotlin/DocInvokerDescriptor.kt
+++ b/common/common-runner/src/main/kotlin/DocInvokerDescriptor.kt
@@ -5,4 +5,4 @@ import com.copperleaf.kodiak.common.modules.ModuleLocator
 data class DocInvokerDescriptor(
     val defaultModuleLocator: ModuleLocator,
     val validFileExtensions: List<String>
-)
\ No newline at end of file
+)
diff --git a/common/common-runner/src/main/kotlin/modules/DelegatingModuleLocator.kt b/common/common-runner/src/main/kotlin/modules/DelegatingModuleLocator.kt
index 663a2b6..81ffb4f 100644
--- a/common/common-runner/src/main/kotlin/modules/DelegatingModuleLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/DelegatingModuleLocator.kt
@@ -13,5 +13,4 @@ internal class DelegatingModuleLocator(
     override fun getModuleRoots(rootPath: Path): List<Path> {
         return locators.firstBy({ it.getModuleRoots(rootPath) }, { it.isNotEmpty() })
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/DelegatingProjectRootLocator.kt b/common/common-runner/src/main/kotlin/modules/DelegatingProjectRootLocator.kt
index 35b1e45..4cca31d 100644
--- a/common/common-runner/src/main/kotlin/modules/DelegatingProjectRootLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/DelegatingProjectRootLocator.kt
@@ -10,8 +10,7 @@ internal class DelegatingProjectRootLocator(
     private val locators: List<ProjectRootLocator>
 ) : ProjectRootLocator {
 
-    override fun getRootPath(input: Path) : Path? {
+    override fun getRootPath(input: Path): Path? {
         return locators.firstOrNullBy { it.getRootPath(input) }
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/ModuleLocator.kt b/common/common-runner/src/main/kotlin/modules/ModuleLocator.kt
index fd8cb96..f3e7379 100644
--- a/common/common-runner/src/main/kotlin/modules/ModuleLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/ModuleLocator.kt
@@ -7,11 +7,11 @@ import java.nio.file.Path
  */
 interface ModuleLocator {
 
-    fun getModuleRoots(rootPath: Path) : List<Path>
+    fun getModuleRoots(rootPath: Path): List<Path>
 
     companion object {
-        fun from(vararg locators: ModuleLocator) : ModuleLocator {
+        fun from(vararg locators: ModuleLocator): ModuleLocator {
             return DelegatingModuleLocator(locators.toList())
         }
     }
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/ProjectRootLocator.kt b/common/common-runner/src/main/kotlin/modules/ProjectRootLocator.kt
index 4be3f33..af61657 100644
--- a/common/common-runner/src/main/kotlin/modules/ProjectRootLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/ProjectRootLocator.kt
@@ -13,12 +13,11 @@ interface ProjectRootLocator {
      * Return the project root given an arbitrary path expected to be in that root. Returns null if the locator is
      * unable to determine the project root given the input path.
      */
-    fun getRootPath(input: Path) : Path?
+    fun getRootPath(input: Path): Path?
 
     companion object {
-        fun from(vararg locators: ProjectRootLocator) : ProjectRootLocator {
+        fun from(vararg locators: ProjectRootLocator): ProjectRootLocator {
             return DelegatingProjectRootLocator(locators.toList())
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/impl/modulelocator/GradleModuleLocator.kt b/common/common-runner/src/main/kotlin/modules/impl/modulelocator/GradleModuleLocator.kt
index ffd3427..6a5e017 100644
--- a/common/common-runner/src/main/kotlin/modules/impl/modulelocator/GradleModuleLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/impl/modulelocator/GradleModuleLocator.kt
@@ -8,8 +8,7 @@ import java.nio.file.Path
  */
 class GradleModuleLocator : ModuleLocator {
 
-    override fun getModuleRoots(rootPath: Path) : List<Path> {
+    override fun getModuleRoots(rootPath: Path): List<Path> {
         return emptyList()
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/impl/modulelocator/MavenModuleLocator.kt b/common/common-runner/src/main/kotlin/modules/impl/modulelocator/MavenModuleLocator.kt
index 8292777..3463d1e 100644
--- a/common/common-runner/src/main/kotlin/modules/impl/modulelocator/MavenModuleLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/impl/modulelocator/MavenModuleLocator.kt
@@ -8,8 +8,7 @@ import java.nio.file.Path
  */
 class MavenModuleLocator : ModuleLocator {
 
-    override fun getModuleRoots(rootPath: Path) : List<Path> {
+    override fun getModuleRoots(rootPath: Path): List<Path> {
         return emptyList()
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/impl/rootlocator/DefaultProjectRootLocator.kt b/common/common-runner/src/main/kotlin/modules/impl/rootlocator/DefaultProjectRootLocator.kt
index e722054..956912c 100644
--- a/common/common-runner/src/main/kotlin/modules/impl/rootlocator/DefaultProjectRootLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/impl/rootlocator/DefaultProjectRootLocator.kt
@@ -29,5 +29,4 @@ class DefaultProjectRootLocator(
             "settings.gradle(.kts)?"
         )
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/modules/impl/rootlocator/GitProjectRootLocator.kt b/common/common-runner/src/main/kotlin/modules/impl/rootlocator/GitProjectRootLocator.kt
index 72dbb6d..480d31d 100644
--- a/common/common-runner/src/main/kotlin/modules/impl/rootlocator/GitProjectRootLocator.kt
+++ b/common/common-runner/src/main/kotlin/modules/impl/rootlocator/GitProjectRootLocator.kt
@@ -8,14 +8,13 @@ import java.nio.file.Path
  */
 class GitProjectRootLocator : ProjectRootLocator {
 
-    override fun getRootPath(input: Path) : Path? {
+    override fun getRootPath(input: Path): Path? {
         var currentDir: Path? = input
-        while(currentDir != null) {
-            if(currentDir.fileName.toString() == ".git") return currentDir
+        while (currentDir != null) {
+            if (currentDir.fileName.toString() == ".git") return currentDir
             currentDir = currentDir.parent
         }
 
         return null
     }
-
-}
\ No newline at end of file
+}
diff --git a/common/common-runner/src/main/kotlin/utils.kt b/common/common-runner/src/main/kotlin/utils.kt
index 354cef6..e1d801d 100644
--- a/common/common-runner/src/main/kotlin/utils.kt
+++ b/common/common-runner/src/main/kotlin/utils.kt
@@ -1,29 +1,29 @@
 package com.copperleaf.kodiak.common
 
 // -- VERSION --
-const val version = "0.5.1"
+const val version = "1.0.0"
 // -- ENDVERSION --
 
-internal inline fun <T : Any?, U : Any?> List<T>.firstBy(mapper: (T)->U) : U {
+internal inline fun <T : Any?, U : Any?> List<T>.firstBy(mapper: (T) -> U): U {
     return firstBy(mapper) { it != null }
 }
 
-internal inline fun <T : Any?, U : Any?> List<T>.firstBy(mapper: (T)->U, predicate: (U)->Boolean) : U {
-    for(item in this) {
+internal inline fun <T : Any?, U : Any?> List<T>.firstBy(mapper: (T) -> U, predicate: (U) -> Boolean): U {
+    for (item in this) {
         val result = mapper(item)
-        if(predicate(result)) return result
+        if (predicate(result)) return result
     }
     throw NoSuchElementException("Collection contains no mapped element matching the predicate.")
 }
 
-internal inline fun <T : Any?, U : Any?> List<T>.firstOrNullBy(mapper: (T)->U) : U? {
+internal inline fun <T : Any?, U : Any?> List<T>.firstOrNullBy(mapper: (T) -> U): U? {
     return firstOrNullBy(mapper) { it != null }
 }
 
-internal inline fun <T : Any?, U : Any?> List<T>.firstOrNullBy(mapper: (T)->U, predicate: (U)->Boolean) : U? {
-    for(item in this) {
+internal inline fun <T : Any?, U : Any?> List<T>.firstOrNullBy(mapper: (T) -> U, predicate: (U) -> Boolean): U? {
+    for (item in this) {
         val result = mapper(item)
-        if(predicate(result)) return result
+        if (predicate(result)) return result
     }
     return null
 }
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
index 8cde19d..0405aab 100644
--- a/docs/build.gradle.kts
+++ b/docs/build.gradle.kts
@@ -1,38 +1,42 @@
 plugins {
-    id("com.eden.orchidPlugin") version "0.20.0"
+    id("com.eden.orchidPlugin") version "0.21.1"
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
 }
 
-group = rootProject.group
-version = rootProject.version
-
 repositories {
     jcenter()
 }
 
 dependencies {
-    orchidRuntimeOnly(Libs.orchiddocs)
-    orchidRuntimeOnly(Libs.orchidcopper)
-    orchidRuntimeOnly(Libs.orchidplugindocs)
-    orchidRuntimeOnly(Libs.orchidgithub)
-    orchidRuntimeOnly(Libs.orchidkotlindoc)
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidDocs:0.21.1")
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidCopper:0.21.1")
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidGithub:0.21.1")
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidKotlindoc:0.21.1")
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidPluginDocs:0.21.1")
+    orchidRuntimeOnly("io.github.javaeden.orchid:OrchidSnippets:0.21.1")
 }
 
-// Orchid config
-//----------------------------------------------------------------------------------------------------------------------
+// Orchid setup
+// ---------------------------------------------------------------------------------------------------------------------
 
-orchid {
-    githubToken = if (project.hasProperty("github_token"))
-        project.property("github_token")?.toString()
-    else
-        System.getenv("GITHUB_TOKEN")?.toString()
+val ghUser: String by extra
+val ghToken: String by extra
+val releaseVersion: String by extra
 
-    args = listOf("--experimentalSourceDoc")
+orchid {
+    githubToken = ghToken
+    version = releaseVersion
 }
+
+val build by tasks
+val check by tasks
 val orchidBuild by tasks
 val orchidDeploy by tasks
 
-//val build by tasks
-//build.dependsOn(orchidBuild)
+orchidBuild.mustRunAfter(check)
+build.dependsOn(orchidBuild)
 
 val publish by tasks.registering {
     dependsOn(orchidDeploy)
diff --git a/docs/src/orchid/resources/404.peb b/docs/src/orchid/resources/404.peb
deleted file mode 100644
index a5b4d5a..0000000
--- a/docs/src/orchid/resources/404.peb
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: boxNoTitle
----
-
-<div class="has-text-centered">
-  <div class="is-size-1" style="margin-bottom: 30px;">There's nothing here!</div>
-  <img src="{{ 'assets/media/undraw_page_not_found.svg'|asset }}" alt="Not Found">
-  <!-- Image courtesy of unDraw (https://undraw.co/license) -->
-</div>
diff --git a/docs/src/orchid/resources/assets/media/theme-logo.png b/docs/src/orchid/resources/assets/media/theme-logo.png
deleted file mode 100644
index 599e69a6a30428e2413136ee786dd2a0f28be24e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25844
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
Mzhl#VTTbl%0}f^khyVZp

diff --git a/docs/src/orchid/resources/assets/media/undraw_page_not_found.svg b/docs/src/orchid/resources/assets/media/undraw_page_not_found.svg
deleted file mode 100644
index dbeb861..0000000
--- a/docs/src/orchid/resources/assets/media/undraw_page_not_found.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="fd59ce54-f850-4dfc-bc34-dd7d379d600e" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="1074.392" height="584.231" viewBox="0 0 1074.392 584.231"><title>page not found</title><ellipse cx="540.64346" cy="549.3094" rx="527.5" ry="34.9216" fill="#f2f2f2"/><path d="M583.47969,324.89424c-85.94407,0-147.651,55.13938-147.651,183.79791,0,145.813,61.70691,184.41057,147.651,184.41057s151.327-42.27352,151.327-184.41057C734.80664,356.75255,669.42376,324.89424,583.47969,324.89424Zm.56495,319.80837c-59.52686,0-90.62592-34.92288-90.62592-135.9163,0-89.11185,32.37209-136.10461,91.899-136.10461s91.899,30.86774,91.899,136.10461C677.21663,607.23367,643.5715,644.70261,584.04464,644.70261Z" transform="translate(-63.054 -157.8845)" fill="#2f2e41"/><path d="M384.36531,591.40121H348.831V486.76183A20.95585,20.95585,0,0,0,327.87517,465.806h-8.32638a20.95585,20.95585,0,0,0-20.95586,20.95585V591.40121H198.36285a11.96327,11.96327,0,0,1-10.57763-17.552l106.0824-200.78034A20.95585,20.95585,0,0,0,284.28724,344.33l-6.26231-2.9572a20.95585,20.95585,0,0,0-27.4293,9.07005L121.21416,592.4754a28.41578,28.41578,0,0,0-3.35584,13.39612v0a28.41583,28.41583,0,0,0,28.41584,28.41583H298.59293v66.16727a25.119,25.119,0,0,0,25.119,25.119h.00005a25.119,25.119,0,0,0,25.119-25.119V634.28739h35.53428a21.44307,21.44307,0,0,0,21.44307-21.44307v0A21.44307,21.44307,0,0,0,384.36531,591.40121Z" transform="translate(-63.054 -157.8845)" fill="#48baef"/><path d="M1042.36183,591.40121h-35.53428V486.76183A20.95585,20.95585,0,0,0,985.87169,465.806h-8.32638a20.95585,20.95585,0,0,0-20.95586,20.95585V591.40121H856.35937a11.96326,11.96326,0,0,1-10.57763-17.552L951.86413,373.06891A20.95586,20.95586,0,0,0,942.28376,344.33l-6.26231-2.9572a20.95586,20.95586,0,0,0-27.42931,9.07005L779.21068,592.4754a28.41578,28.41578,0,0,0-3.35584,13.39612v0a28.41583,28.41583,0,0,0,28.41583,28.41583H956.58945v66.16727a25.119,25.119,0,0,0,25.119,25.119h0a25.119,25.119,0,0,0,25.119-25.119V634.28739h35.53428a21.44307,21.44307,0,0,0,21.44307-21.44307v0A21.44307,21.44307,0,0,0,1042.36183,591.40121Z" transform="translate(-63.054 -157.8845)" fill="#48baef"/><path d="M394.16787,579.148H358.63358V474.50864a20.95585,20.95585,0,0,0-20.95585-20.95586h-8.32638a20.95586,20.95586,0,0,0-20.95586,20.95586V579.148H208.16541a11.96327,11.96327,0,0,1-10.57763-17.552L303.67017,360.81572a20.95586,20.95586,0,0,0-9.58037-28.73893l-6.26231-2.9572a20.95586,20.95586,0,0,0-27.42931,9.07L131.01672,580.2222a28.41582,28.41582,0,0,0-3.35584,13.39613v0a28.41583,28.41583,0,0,0,28.41583,28.41583H308.39549v66.16727a25.119,25.119,0,0,0,25.119,25.119h.00005a25.119,25.119,0,0,0,25.119-25.119V622.0342h35.53429a21.44307,21.44307,0,0,0,21.44307-21.44307v0A21.44307,21.44307,0,0,0,394.16787,579.148Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M1060.74162,579.148h-35.53428V474.50864a20.95586,20.95586,0,0,0-20.95586-20.95586H995.9251a20.95586,20.95586,0,0,0-20.95586,20.95586V579.148H874.73916a11.96327,11.96327,0,0,1-10.57763-17.552L970.24392,360.81572a20.95586,20.95586,0,0,0-9.58037-28.73893l-6.26231-2.9572a20.95586,20.95586,0,0,0-27.42931,9.07L797.59047,580.2222a28.41582,28.41582,0,0,0-3.35584,13.39613v0a28.41583,28.41583,0,0,0,28.41583,28.41583H974.96924v66.16727a25.119,25.119,0,0,0,25.119,25.119h0a25.119,25.119,0,0,0,25.119-25.119V622.0342h35.53428a21.44307,21.44307,0,0,0,21.44307-21.44307v0A21.44307,21.44307,0,0,0,1060.74162,579.148Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M603.0848,313.86637c-85.94407,0-147.651,55.13937-147.651,183.79791,0,145.813,61.70691,184.41057,147.651,184.41057s151.327-42.27352,151.327-184.41057C754.41175,345.72467,689.02887,313.86637,603.0848,313.86637Zm.565,319.80836c-59.52686,0-90.62592-34.92287-90.62592-135.91629,0-89.11185,32.37209-136.10461,91.899-136.10461s91.899,30.86774,91.899,136.10461C696.82174,596.20579,663.17661,633.67473,603.64975,633.67473Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><circle cx="471.14108" cy="18.25044" r="12.90118" fill="#2f2e41"/><ellipse cx="502.60736" cy="46.88476" rx="36.18622" ry="46.88476" fill="#2f2e41"/><path d="M565.66136,237.49419c-18.1276,0-33.1413-17.27052-35.77576-39.80484a60.9759,60.9759,0,0,0-.41046,7.07991c0,25.89373,16.20114,46.88476,36.18622,46.88476s36.18623-20.991,36.18623-46.88476a60.9759,60.9759,0,0,0-.41046-7.07991C598.80267,220.22367,583.789,237.49419,565.66136,237.49419Z" transform="translate(-63.054 -157.8845)" opacity="0.1"/><path d="M639.29619,342.07326c-.77711,3.19345-4.12792,5.751-7.83881,7.53791-7.80188,3.75682-17.4253,4.87788-26.7597,5.25418a45.17622,45.17622,0,0,1-7.1445-.132,20.5371,20.5371,0,0,1-12.25052-5.63141,1.68086,1.68086,0,0,1,.04371-2.84388c4.9694-5.45888,13.2622-8.80605,21.61613-11.21609,6.3344-1.82743,17.3813-6.56089,24.29013-5.9221C637.94444,329.73864,640.2774,338.04112,639.29619,342.07326Z" transform="translate(-63.054 -157.8845)" fill="#3f3d56"/><path d="M639.29619,342.07326c-.77711,3.19345-4.12792,5.751-7.83881,7.53791-7.80188,3.75682-17.4253,4.87788-26.7597,5.25418a45.17622,45.17622,0,0,1-7.1445-.132,20.5371,20.5371,0,0,1-12.25052-5.63141,1.68086,1.68086,0,0,1,.04371-2.84388c4.9694-5.45888,13.2622-8.80605,21.61613-11.21609,6.3344-1.82743,17.3813-6.56089,24.29013-5.9221C637.94444,329.73864,640.2774,338.04112,639.29619,342.07326Z" transform="translate(-63.054 -157.8845)" opacity="0.1"/><path d="M540.09786,318.2059a19.76967,19.76967,0,0,0-1.1987,15.07476,26.33914,26.33914,0,0,0,8.82921,12.49683c10.09467,8.09163,23.98784,9.20512,36.92477,9.09278a284.6495,284.6495,0,0,0,33.90525-2.32384,40.53788,40.53788,0,0,0,11.00143-2.55442c4.22242-1.82679,7.93282-5.17756,9.436-9.5257s.43625-9.67246-3.13383-12.57428c-3.13686-2.54969-7.46265-2.9004-11.49775-3.14289l-23.08764-1.38745c2.281-2.30839,5.31816-3.614,8.09586-5.29216,3.68523-2.22642,6.13358-5.96455,8.81312-9.33471a129.00143,129.00143,0,0,1,13.4386-13.817c.75138,4.31038,3.4782,7.8499,6.68733,10.824s6.90841,5.36845,10.2439,8.20013c8.0786,6.85838,13.89583,16.1669,22.39215,22.50043a43.82885,43.82885,0,0,0,16.04862-8.0122l-3.30209-5.98141a3.94,3.94,0,0,0-1.24459-1.55282c-.93465-.575-2.13975-.27872-3.225-.44144-2.90082-.435-4.16771-3.784-5.306-6.48737-3.12491-7.42173-9.108-13.17993-14.21783-19.40381a98.00854,98.00854,0,0,1-9.99577-14.72284c-1.71652-3.10162-3.288-6.33107-5.61746-9.00321s-5.59358-4.773-9.1385-4.78051c-3.13222-.00662-6.02122,1.58355-8.71422,3.18308a230.47679,230.47679,0,0,0-23.63018,16.09894c-3.94376,3.0617-7.86306,6.29645-12.48933,8.17393-1.94748.79035-4.00044,1.33052-5.86924,2.29223-3.27313,1.6844-5.75721,4.53435-8.43128,7.06415C566.27712,311.89225,553.219,317.73841,540.09786,318.2059Z" transform="translate(-63.054 -157.8845)" fill="#3f3d56"/><path d="M588.3737,253.98251a23.77444,23.77444,0,0,1-1.73379,8.03335,10.04492,10.04492,0,0,1-5.76772,5.57269,12.37513,12.37513,0,0,1-5.62306.18249,10.88232,10.88232,0,0,1-4.58151-1.56071c-2.16484-1.48837-3.24415-4.14413-3.63748-6.74325-.39333-2.596-.21714-5.24857-.46885-7.86342a42.94439,42.94439,0,0,0-1.202-6.25549c-.16993-.68282-.343-1.36248-.51294-2.04216-.16674-.67967-.33037-1.35935-.48141-2.039-.13847-.63878-.26745-1.28068-.37761-1.92574-.09123-.54436-.173-1.09189-.23285-1.64255a18.42329,18.42329,0,0,0-.80867-4.81118,14.60727,14.60727,0,0,0-1.68659-2.854c-.28635-.40906-.56326-.81811-.81815-1.24292a5.88984,5.88984,0,0,1-.97226-3.74763,3.286,3.286,0,0,1,.14788-.601c.02516-.07552.05347-.151.085-.2234A1.80187,1.80187,0,0,0,560.932,223.07a3.43341,3.43341,0,0,0-.14788-1.77783,11.31808,11.31808,0,0,0-.95974-2.28761c-.2643-.47829-1.16108-1.34046-1.16738-1.888-.0126-1.10132,2.13972-1.98867,3.01134-2.42291a16.79623,16.79623,0,0,1,8.59657-1.74323c1.90369.129,3.9679.71428,5.0189,2.30962.944,1.438.81807,3.30081,1.22085,4.97169a1.47068,1.47068,0,0,0,.29892.66393,1.34135,1.34135,0,0,0,.73948.33982,4.54948,4.54948,0,0,0,1.416.05666h.00315a2.93138,2.93138,0,0,0,.37128-.05351,4.957,4.957,0,0,0,2.03271-.8779q.58531-.15576,1.18-.25488a.25112.25112,0,0,0,.04725-.00945c1.57646,4.97482,1.781,10.30836,3.07111,15.37444.63874,2.52044,1.55442,5.00943,1.6834,7.60225.00945.11327.0126.2297.01575.34612.0189.83386-.04717,1.674-.0126,2.50472a6.981,6.981,0,0,0,.12591,1.1139,15.61121,15.61121,0,0,0,.52546,1.74325l.00945.02831c.05977.18251.11643.36817.16363.55381.03457.1353.06607.26747.09127.40277l.00311.00943A14.93754,14.93754,0,0,1,588.3737,253.98251Z" transform="translate(-63.054 -157.8845)" fill="#fbbebe"/><circle cx="503.23669" cy="44.99678" r="18.56511" fill="#fbbebe"/><path d="M684.15711,304.03278a30.445,30.445,0,0,0-5.236-14.10317q.72216,4.29513,1.44748,8.58714a3.214,3.214,0,0,1-3.36688-1.03523,10.33663,10.33663,0,0,1-1.76529-3.27565,67.46571,67.46571,0,0,0-8.2095-14.73567c-11.81876-.98489-23.50223-5.88418-33.89555-11.59532-10.39643-5.708-20.12582-12.5519-30.38382-18.50217a43.57346,43.57346,0,0,0-5.54436-2.832c-3.20954-1.287-6.81242-1.95406-9.85526-3.46759-.2045-.1007-.409-.20767-.61043-.31781a12.57834,12.57834,0,0,1-1.94459-1.30584,10.34363,10.34363,0,0,1-.93139-.8559,20.35115,20.35115,0,0,1-3.55886-5.95341c-1.63308-3.61232-2.21524-7.97041-3.84517-11.58274a11.20292,11.20292,0,0,1,2.50156-1.76525h.00315c.13213-.06924.2643-.13532.39962-.19824a11.9404,11.9404,0,0,1,2.00437-.73317q.58531-.15576,1.18-.25488a.25112.25112,0,0,0,.04725-.00945,11.56564,11.56564,0,0,1,5.49085.43424c2.58652.87477,4.76711,2.62115,6.94148,4.27313a114.02006,114.02006,0,0,1,10.14787,8.04908c1.79357,1.718,3.4298,3.606,5.35868,5.16676a42.14393,42.14393,0,0,0,5.05662,3.35116q15.65613,9.32658,31.31525,18.65005c3.53365,2.1051,7.07046,4.21019,10.52553,6.438,5.24855,3.38578,10.30828,7.05474,15.36493,10.72057q4.46978,3.23787,8.93647,6.47889a9.72771,9.72771,0,0,1,2.533,2.3411,8.4724,8.4724,0,0,1,1.12337,3.433A31.3874,31.3874,0,0,1,684.15711,304.03278Z" transform="translate(-63.054 -157.8845)" fill="#fbbebe"/><path d="M592.97726,267.9441c-1.25235,5.61674-6.92888,9.012-9.89617,13.94586-3.68784,6.12335-2.18378,13.241-.79922,20.25484q-3.79485,3.27095-7.59285,6.54186c-1.39708,1.19886-2.79417,2.404-4.29827,3.46444a57.35064,57.35064,0,0,1-6.85966,3.93956q-3.3606,1.72752-6.72119,3.45814a32.1282,32.1282,0,0,1-6.57961,2.78793c-4.41473,1.13278-9.10318.33982-13.4707-.97232a6.08761,6.08761,0,0,1-1.47264-.601,2.39351,2.39351,0,0,1-.69854-.63248,3.91067,3.91067,0,0,1-.44365-2.53933c.44365-7.35052,2.24036-14.54686,4.03081-21.68971a85.2598,85.2598,0,0,1,3.84832-12.57708,85.0766,85.0766,0,0,1,5.41538-10.151,68.36751,68.36751,0,0,1,7.92948-11.51353,18.47881,18.47881,0,0,0,3.67525-4.73882c1.11706-2.54876.686-5.472.91252-8.24732a17.14844,17.14844,0,0,1,1.63312-6.0069v-.00315a17.09326,17.09326,0,0,1,1.74321-2.88232q.45788,1.06671.91568,2.13027.30209.69855.59783,1.394.38706.89679.7678,1.78728,1.09973,2.55823,2.19637,5.11327a21.58968,21.58968,0,0,0,3.33538,5.944,6.49923,6.49923,0,0,0,11.12337-.85275,21.26125,21.26125,0,0,0,2.27185-6.0132,19.21547,19.21547,0,0,0,.25175-7.83509c-.75835-5.00945-2.88862-10.12585-4.43678-14.77972a14.94511,14.94511,0,0,1-1.07927-4.871,3.35144,3.35144,0,0,1,.05662-.56011c.00945-.04719.0189-.09754.02834-.14473a11.9404,11.9404,0,0,1,2.00437-.73317q.58531-.15576,1.18-.25488,2.04378,11.06355,4.09377,22.12709c.0315.17307.0661.34613.09756.52234.19509,1.05726.39333,2.11454.61358,3.16865.19828.95657.41223,1.91.65137,2.85715l.00945.02831c.08182.321.16678.63877.2549.95658l.00311.00943c.2423.86848.5129,1.73065.81811,2.58024C590.93825,257.47528,594.16355,262.62946,592.97726,267.9441Z" transform="translate(-63.054 -157.8845)" fill="#48baef"/><path d="M668.32144,346.87707a6.58269,6.58269,0,0,0,.61,3.14328c1.16192,2.12353,3.94981,2.60625,6.36228,2.80484a188.37688,188.37688,0,0,0,42.2657-1.28774,4.88565,4.88565,0,0,0,2.15136-.66766c1.98985-1.39509.76329-4.7951-1.40951-5.88355s-4.75126-.82614-7.1353-1.29748a22.47912,22.47912,0,0,1-6.67794-2.89617q-7.25234-4.16669-14.293-8.68808c-2.79453-1.79464-6.09272-3.70993-9.23987-2.64587C672.43,332.34264,668.26533,337.68065,668.32144,346.87707Z" transform="translate(-63.054 -157.8845)" fill="#3f3d56"/><path d="M564.43732,240.87367v.00315c-.022.13215-.04406.26116-.07237.39018-.0346.214-.07551.43108-.11642.645-.39018,1.99812-.86847,3.98678-1.41913,5.96287-1.5104,5.45939-3.53366,10.83069-5.54121,16.12332q-8.08055,21.28692-16.16423,42.577c-1.35936,3.57457-2.71554,7.15228-4.26054,10.65448-.516,1.16741-1.04782,2.34424-1.57647,3.53368-1.89427,4.25737-3.713,8.65322-4.31716,13.18436a27.44976,27.44976,0,0,0-.19194,9.04027c.60416,2.97042,2.40718,5.8716,5.22969,6.96977,1.37823.53808,3.35113,1.25865,2.97355,2.69037-.2045.78665-1.09817,1.17055-1.90057,1.3027a7.31234,7.31234,0,0,1-5.966-1.718c-1.50725-1.33732-2.66518-3.41725-4.66959-3.64065-1.38767-.151-2.66518.67966-3.93643,1.26178-5.18564,2.36942-11.22719.71114-16.674-.9723.42794-2.20579,2.64318-3.65953,4.84267-4.10006,2.19949-.44367,4.47449-.129,6.718-.18879a3.50958,3.50958,0,0,0,2.04216-.52549,3.70545,3.70545,0,0,0,1.10132-1.88169,78.96356,78.96356,0,0,0,3.21273-13.14661c.7237-4.66645,1.02581-9.40527,2.05787-14.01507.80241-3.59661,2.0422-7.07991,3.10572-10.61044a224.68238,224.68238,0,0,0,5.0598-22.07674,78.02019,78.02019,0,0,0,1.42543-9.36751c.17935-2.6117.09438-5.236.34609-7.83826a60.8877,60.8877,0,0,1,2.11141-9.99683q1.44427-5.34769,2.88547-10.68911c1.42544-5.2706,2.95465-10.74572,6.567-14.84264a13.96159,13.96159,0,0,1,10.02834-4.78915,9.8819,9.8819,0,0,1,2.13027.22969c.11639.02831.23285.05664.34923.0881a8.63447,8.63447,0,0,1,2.17437.89995c1.11388-.708,1.68025-.45942,2.41974.63246a6.97319,6.97319,0,0,1,.88107,3.79485A52.42378,52.42378,0,0,1,564.43732,240.87367Z" transform="translate(-63.054 -157.8845)" fill="#fbbebe"/><path d="M565.66136,245.0461l-.0472.04719-.25486.25488-2.5299,2.52675-1.23976-5.20767-4.25109-17.854a9.8819,9.8819,0,0,1,2.13027.22969,3.286,3.286,0,0,1,.14788-.601l.20135.68911,1.44118,4.90245,2.72811,9.30773.45,1.53241v.00315Z" transform="translate(-63.054 -157.8845)" fill="#48baef"/><path d="M581.71523,188.0873a12.58165,12.58165,0,0,1-3.70049,8.89583,12.31392,12.31392,0,0,1-1.36008,1.17634,12.52812,12.52812,0,0,1-7.53567,2.52415H554.023a12.5902,12.5902,0,0,1,0-25.18037h15.096A12.62919,12.62919,0,0,1,581.71523,188.0873Z" transform="translate(-63.054 -157.8845)" fill="#2f2e41"/><circle cx="532.81499" cy="18.25044" r="12.90118" fill="#2f2e41"/><path d="M595.55433,163.23377c-.15825,0-.31505.00628-.472.01193a12.89776,12.89776,0,0,1,0,25.77849c.15694.00565.31374.01193.472.01193a12.90117,12.90117,0,1,0,0-25.80235Z" transform="translate(-63.054 -157.8845)" opacity="0.1"/><path d="M534.19508,163.23377c.15825,0,.31505.00628.472.01193a12.89776,12.89776,0,0,0,0,25.77849c-.157.00565-.31375.01193-.472.01193a12.90118,12.90118,0,0,1,0-25.80235Z" transform="translate(-63.054 -157.8845)" opacity="0.1"/><path d="M576.65466,198.15947a12.52812,12.52812,0,0,1-7.53567,2.52415H554.023a12.52833,12.52833,0,0,1-7.53574-2.52415Z" transform="translate(-63.054 -157.8845)" opacity="0.1"/><path d="M674.13958,291.64042s3.25228,9.37161,6.229,6.87633L677.996,286.26693Z" transform="translate(-63.054 -157.8845)" fill="#fbbebe"/><path d="M1069.91781,577.43414a20.81252,20.81252,0,1,0,2.7716-39.91524l.52093,10.7122-5.06814-9.18045a20.734,20.734,0,0,0-10.68367,11.72261,20.40847,20.40847,0,0,0-1.19713,5.62986A20.80856,20.80856,0,0,0,1069.91781,577.43414Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M1094.99516,701.67756c-1.78906-9.11027,5.9633-17.1868,13.62086-22.43651s16.605-10.40779,19.21775-19.31684c3.755-12.80387-7.43-24.52981-16.13564-34.64176a125.30044,125.30044,0,0,1-16.52359-24.55738c-1.81107-3.5325-3.47558-7.22528-3.95221-11.16626-.68641-5.67546,1.13693-11.32309,2.9739-16.73673q9.17925-27.05169,19.62843-53.65005" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M1070.77493,574.6762a20.81252,20.81252,0,1,0,2.7716-39.91524l.52093,10.7122-5.06815-9.18045a20.734,20.734,0,0,0-10.68366,11.72261,20.40847,20.40847,0,0,0-1.19713,5.62986A20.80855,20.80855,0,0,0,1070.77493,574.6762Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M1092.45136,515.47266a20.78819,20.78819,0,0,1,14.97993-13.19764l1.71361,10.18378,3.177-10.69566a20.81,20.81,0,1,1-19.87057,13.70952Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M1093.59418,511.7954a20.7882,20.7882,0,0,1,14.97993-13.19763l1.71361,10.18378,3.177-10.69567a20.81,20.81,0,1,1-19.87057,13.70952Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M1108.04474,625.48885a20.81,20.81,0,0,0,18.419-37.02267l-2.44121,8.21926-1.73105-10.30382a.36183.36183,0,0,0-.053-.0201,20.81113,20.81113,0,1,0-14.1938,39.12733Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M1109.035,621.76417a20.81,20.81,0,0,0,18.419-37.02267l-2.44121,8.21926-1.73105-10.30382a.3621.3621,0,0,0-.053-.0201,20.81113,20.81113,0,1,0-14.1938,39.12733Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M1086.37782,660.05148a20.80131,20.80131,0,1,0,4.01058-16.29737l9.27267,13.95654-12.66994-7.40768A20.61638,20.61638,0,0,0,1086.37782,660.05148Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M1087.23494,657.29354a20.80131,20.80131,0,1,0,4.01058-16.29737l9.27267,13.95655-12.66994-7.40769A20.61626,20.61626,0,0,0,1087.23494,657.29354Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M72.06146,628.13325a13.67421,13.67421,0,1,0,1.821-26.225l.34227,7.03811-3.32987-6.03172a13.62263,13.62263,0,0,0-7.01936,7.702,13.40883,13.40883,0,0,0-.78654,3.69893A13.6716,13.6716,0,0,0,72.06146,628.13325Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M88.53774,709.76344c-1.17545-5.98561,3.918-11.292,8.94915-14.7412s10.90978-6.8381,12.62642-12.69151c2.46711-8.41238-4.88167-16.11653-10.60142-22.76027A82.32442,82.32442,0,0,1,88.6556,643.43581a22.20962,22.20962,0,0,1-2.59668-7.33643c-.451-3.72888.747-7.43947,1.95391-10.99634q6.03093-17.77346,12.89623-35.24906" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M72.62461,626.32123a13.6742,13.6742,0,1,0,1.821-26.225l.34227,7.03812L71.458,601.10258a13.62262,13.62262,0,0,0-7.01936,7.702,13.40912,13.40912,0,0,0-.78654,3.69892A13.67158,13.67158,0,0,0,72.62461,626.32123Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M86.86641,587.42343a13.65822,13.65822,0,0,1,9.84209-8.67109l1.12587,6.69093,2.08737-7.02725a13.67252,13.67252,0,1,1-13.05533,9.00741Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M87.61727,585.0074a13.65822,13.65822,0,0,1,9.84209-8.67108l1.12587,6.69093L100.6726,576a13.67252,13.67252,0,1,1-13.05533,9.0074Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M97.11155,659.70607a13.67255,13.67255,0,0,0,12.10164-24.32457l-1.60392,5.4002-1.13733-6.76979a.238.238,0,0,0-.0348-.0132,13.67329,13.67329,0,1,0-9.32559,25.70736Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M97.76214,657.25889a13.67255,13.67255,0,0,0,12.10164-24.32457l-1.60392,5.4002-1.13733-6.7698a.238.238,0,0,0-.0348-.0132,13.67329,13.67329,0,1,0-9.32559,25.70737Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M82.876,682.41435a13.66684,13.66684,0,1,0,2.635-10.70767l6.09231,9.16971-8.32438-4.867A13.54535,13.54535,0,0,0,82.876,682.41435Z" transform="translate(-63.054 -157.8845)" fill="#57b894"/><path d="M83.43913,680.60233a13.66684,13.66684,0,1,0,2.635-10.70767l6.09231,9.16971-8.32439-4.867A13.54535,13.54535,0,0,0,83.43913,680.60233Z" transform="translate(-63.054 -157.8845)" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><ellipse cx="480.946" cy="319.1155" rx="17" ry="22" fill="#2f2e41"/><ellipse cx="573.446" cy="319.6155" rx="17" ry="22" fill="#2f2e41"/><path d="M623.5,542.5c0,9.94-13.88,18-31,18s-31-8.06-31-18c0-8.61,10.41-15.81,24.32-17.57a50.10353,50.10353,0,0,1,6.68-.43,50.69869,50.69869,0,0,1,11.13,1.2C615.25,528.29,623.5,534.84,623.5,542.5Z" transform="translate(-63.054 -157.8845)" fill="#2f2e41"/><ellipse cx="484.946" cy="314.1155" rx="17" ry="22" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><ellipse cx="577.446" cy="314.6155" rx="17" ry="22" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><ellipse cx="533.446" cy="379.6155" rx="31" ry="18" fill="none" stroke="#3f3d56" stroke-miterlimit="10"/><path d="M604,527.2a4.93658,4.93658,0,0,1-1.32,3.392A4.33873,4.33873,0,0,1,599.5,532h-10a4.66433,4.66433,0,0,1-4.5-4.8,4.90458,4.90458,0,0,1,.82-2.74134A47.02,47.02,0,0,1,592.5,524a47.66454,47.66454,0,0,1,11.13,1.28A5.06656,5.06656,0,0,1,604,527.2Z" transform="translate(-63.054 -157.8845)" fill="#fff"/><circle cx="484.946" cy="308.1155" r="5" fill="#fff"/><circle cx="577.946" cy="308.1155" r="5" fill="#fff"/><circle cx="582.946" cy="355.1155" r="5" fill="#48baef" opacity="0.3"/><circle cx="460.946" cy="355.1155" r="5" fill="#48baef" opacity="0.3"/></svg>
\ No newline at end of file
diff --git a/docs/src/orchid/resources/config.yml b/docs/src/orchid/resources/config.yml
index 9334294..f8f0976 100644
--- a/docs/src/orchid/resources/config.yml
+++ b/docs/src/orchid/resources/config.yml
@@ -1,72 +1,92 @@
 site:
-  baseUrl: "https://copper-leaf.github.io/kodiak"
-  theme: "Copper"
+  theme: Copper
+  baseUrl: 'https://copper-leaf.github.io/kodiak/'
   about:
     siteName: Kodiak
-    siteDescription: Wrappers around code documentation CLI tools to produce JSON models, usable as libraries
+    siteDescription: A collection of wrappers around various code documentation tools which produces a common JSON output readable by Orchid.
 
 theme:
   social:
     other:
-      - link: 'https://copper-leaf.github.io/kodiak'
-        label: 'Home'
-        icon: 'fas fa-home'
-      - link: 'https://github.com/copper-leaf/kodiak'
-        label: 'Github'
-        icon: 'fab fa-github'
-      - link: 'https://twitter.com/OrchidSSG'
-        label: 'Twitter'
-        icon: 'fab fa-twitter'
-  logo: 'assets/media/theme-logo.png'
+      - { link: 'https://github.com/copper-leaf',         label: 'Copper Leaf Home', icon: 'fas fa-home' }
+      - { link: 'https://github.com/copper-leaf/kodiak', label: 'Github',           icon: 'fab fa-github'}
+      - { link: 'https://twitter.com/OrchidSSG',          label: 'Twitter',          icon: 'fab fa-twitter'}
+  menu:
+    # Main site menu in toolbar
+    - { type: 'github', githubProject: 'orchidhq/Orchid'  }
+    - type: 'submenu'
+      title: 'Copper Leaf'
+      menu:
+        - { type: 'github', githubProject: 'copper-leaf/common'  }
+        - { type: 'github', githubProject: 'copper-leaf/clog'    }
+        - { type: 'github', githubProject: 'copper-leaf/kudzu'   }
+        - { type: 'github', githubProject: 'copper-leaf/trellis' }
+        - { type: 'github', githubProject: 'copper-leaf/thistle' }
+        - { type: 'github', githubProject: 'copper-leaf/kodiak'  }
+        - { type: 'github', githubProject: 'copper-leaf/krow'    }
   sidebarBackground: 'primary'
-  sidebarBackgroundType: GRADIENT
+  sidebarBackgroundType: 'GRADIENT'
   colors:
-    blue: '#48BAEF'
+    orange: '#7d4d38'
   palette:
-    primary: 'BLUE'
-    link: 'BLUE'
-
-services:
-  publications:
-    stages:
-      - type: 'githubPages'
-        repo: 'copper-leaf/kodiak'
-        username: 'cjbrooks12'
-      - type: 'githubReleases'
-        repo: 'copper-leaf/kodiak'
+    primary: 'ORANGE'
+    link: 'ORANGE'
+    linkVisited: 'BLUE'
 
 allPages:
-  components:
-    - type: "pageContent"
-    - type: "prism"
-      githubTheme: 'duotone-light'
-      languages:
-        - java
-        - kotlin
-        - groovy
-        - swift
   menu:
+    # Menu in left sidebar
     - type: 'page'
-      title: 'Home'
       itemId: 'Home'
     - type: 'page'
       itemId: 'Changelog'
-
-    - type: 'separator'
-      title: 'Wiki'
     - type: 'wiki'
-      asSubmenu: true
-
-    - type: 'separator'
-      title: 'Supported Languages'
-    - type: "sourcedocModules"
-      moduleType: 'kotlindoc'
-      moduleGroup: 'languages'
-      asSubmenu: true
   layoutConfig:
+    wrapPageInBox: true
+    wrapTitleInBox: false
+    includeTitle: false
+    includeBreadcrumbs: false
     pageContentsMenu:
+      # Sticky menu on the page
       - type: 'separator'
         title: 'In This Page'
       - type: 'pageIds'
         structure: nested
         maxLevel: 2
+  metaComponents:
+    - type: "orchidSearch"
+    - type: "prism"
+      githubTheme: 'duotone-light'
+      languages:
+        - kotlin
+        - java
+        - groovy
+
+changelog:
+  adapter:
+    type: "file"
+    baseDir: "./../../../../"
+
+snippets:
+  sections:
+    - tags: ['embedded_snippets']
+      adapter:
+        type: 'embedded'
+        recursive: true
+        baseDirs:
+          - './../../../../kodiak-core/'
+
+services:
+  publications:
+    stages:
+      - type: githubReleases
+        repo: 'copper-leaf/kodiak'
+        username: 'cjbrooks12'
+        commitish: 'master'
+      - type: githubPages
+        repo: 'copper-leaf/kodiak'
+        username: 'cjbrooks12'
+  generators:
+    disabled:
+      - 'kotlindoc'
+      - 'assets'
diff --git a/docs/src/orchid/resources/config/kotlindoc.yml b/docs/src/orchid/resources/config/kotlindoc.yml
deleted file mode 100644
index cdf06d1..0000000
--- a/docs/src/orchid/resources/config/kotlindoc.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-homePagePermalink: ':module'
-sourcePagePermalink: ':moduleType/:module/:sourceDocPath'
-
-#homePageOnly: true
-#showRunnerLogs: true
-
-modules:
-  - name: 'Common'
-    moduleGroup: 'common'
-    sourceDirs:
-      - '../../../../common/common-runner/src/main/kotlin'
-  - name: 'Java'
-    moduleGroup: 'languages'
-    sourceDirs:
-      - '../../../../javadoc/javadoc-models/src/main/kotlin'
-      - '../../../../javadoc/javadoc-runner/src/main/kotlin'
-  - name: 'Kotlin'
-    moduleGroup: 'languages'
-    sourceDirs:
-      - '../../../../dokka/dokka-models/src/main/kotlin'
-      - '../../../../dokka/dokka-runner/src/main/kotlin'
-  - name: 'Groovy'
-    moduleGroup: 'languages'
-    sourceDirs:
-      - '../../../../groovydoc/groovydoc-models/src/main/kotlin'
-      - '../../../../groovydoc/groovydoc-runner/src/main/kotlin'
-  - name: 'Swift'
-    moduleGroup: 'languages'
-    sourceDirs:
-      - '../../../../swiftdoc/swiftdoc-models/src/main/kotlin'
-      - '../../../../swiftdoc/swiftdoc-runner/src/main/kotlin'
-
-classesPages:
-  layoutConfig:
-    pageContentsMenu:
-      - type: 'sourcedocPageLinks'
-        includeItems: true
-        itemTitleType: "SIGNATURE"
-
-packagesPages:
-  layoutConfig:
-    pageContentsMenu:
-      - type: 'sourcedocPageLinks'
-        includeItems: true
diff --git a/docs/src/orchid/resources/homepage.md b/docs/src/orchid/resources/homepage.md
index 555e205..6482e75 100644
--- a/docs/src/orchid/resources/homepage.md
+++ b/docs/src/orchid/resources/homepage.md
@@ -1,5 +1,192 @@
 ---
-layout: boxNoTitle
 ---
 
-{{ load('./../../../../README.md') | raw }}
+# kodiak
+
+A collection of wrappers around various code documentation tools which produces a common JSON output readable by Orchid.
+
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/copper-leaf/kodiak)
+![Maven Central](https://img.shields.io/maven-central/v/io.github.copper-leaf/kodiak-core)
+![Kotlin Version](https://img.shields.io/badge/Kotlin-1.4.32-orange)
+
+## Overview
+
+Most code documentation tools work by generating an HTML site. They have to do a lot of work to format navigate the
+code's internal structure, and then create a website that very often, looks quite awful. It would be better for everyone
+if the language designers only needed to produce a code model, and then let someone else do the hard work of turning
+that model into a website.
+
+[Orchid](https://orchid.netlify.com/) is that tool that creates a beautiful website for your code docs. This project is
+the other side of that coin which produces a model that Orchid can use to generate those sites.
+
+## Installation
+
+```kotlin
+repositories {
+    mavenCentral()
+}
+
+// for plain JVM projects
+dependencies {
+    implementation("com.eden.kodiak:javadoc-runner:{{ site.version }}")
+    implementation("com.eden.kodiak:dokka-runner:{{ site.version }}")
+    implementation("com.eden.kodiak:groovydoc-runner:{{ site.version }}")
+    implementation("com.eden.kodiak:swiftdoc-runner:{{ site.version }}")
+}
+```
+
+## Targets
+
+### Java (Javadoc)
+
+```kotlin
+repositories {
+    mavenCentral()
+}
+dependencies {
+    implementation("com.eden.kodiak:javadoc-runner:{{ site.version }}")
+}
+```
+
+```kotlin
+var cacheDir: Path = Files.createTempDirectory("javadocCache")
+val runner: JavadocInvoker = JavadocInvokerImpl(cacheDir)
+
+val outputDir = File("build/javadoc").canonicalFile.toPath()
+outputDir.toFile().deleteRecursively()
+outputDir.toFile().mkdirs()
+
+val rootDoc = runner.getRootDoc(
+    listOf(
+        File("src/main/java").canonicalFile.toPath()
+    ),
+    outputDir
+) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
+
+rootDoc.packages.forEach { processPackage(it) }
+rootDoc.classes.forEach { processClass(it) }
+```
+
+- skip by including `@suppress` in its comments
+    - classes
+    - constructors
+    - fields
+    - methods
+
+- [Javadoc](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html)
+
+### Kotlin (Dokka)
+
+```kotlin
+repositories {
+    mavenCentral()
+}
+dependencies {
+    implementation("com.eden.kodiak:dokka-runner:{{ site.version }}")
+}
+```
+
+```kotlin
+var cacheDir: Path = Files.createTempDirectory("dokkaCache")
+val runner: KotlindocInvoker = KotlindocInvokerImpl(cacheDir)
+
+val outputDir = File("build/dokka").canonicalFile.toPath()
+outputDir.toFile().deleteRecursively()
+outputDir.toFile().mkdirs()
+
+val rootDoc = runner.getRootDoc(
+    listOf(
+        File("src/main/java").canonicalFile.toPath(),
+        File("src/main/kotlin").canonicalFile.toPath()
+    ),
+    outputDir
+) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
+
+rootDoc.packages.forEach { processPackage(it) }
+rootDoc.classes.forEach { processClass(it) }
+```
+
+- skip by including `@suppress` in its comments
+    - classes
+    - constructors
+    - fields
+    - methods
+    
+- [Dokka](https://github.com/Kotlin/dokka)
+
+### Groovy (Groovydoc)
+
+```kotlin
+repositories {
+    mavenCentral()
+}
+dependencies {
+    implementation("com.eden.kodiak:groovydoc-runner:{{ site.version }}")
+}
+```
+
+```kotlin
+var cacheDir: Path = Files.createTempDirectory("groovydocCache")
+val runner: GroovydocInvoker = GroovydocInvokerImpl(cacheDir)
+
+val outputDir = File("build/groovydoc").canonicalFile.toPath()
+outputDir.toFile().deleteRecursively()
+outputDir.toFile().mkdirs()
+
+val rootDoc = runner.getRootDoc(
+    listOf(
+        File("src/main/java").canonicalFile.toPath(),
+        File("src/main/groovy").canonicalFile.toPath()
+    ),
+    outputDir
+) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
+
+rootDoc.packages.forEach { processPackage(it) }
+rootDoc.classes.forEach { processClass(it) }
+```
+
+- skip by including `@suppress` in its comments
+    - classes
+    - constructors
+    - fields
+    - methods
+
+- [Groovydoc](http://docs.groovy-lang.org/docs/next/html/documentation/#_groovydoc_the_groovy_java_documentation_generator)
+
+### Swift (Sourcekitten)
+
+```kotlin
+repositories {
+    mavenCentral()
+}
+dependencies {
+    implementation("com.eden.kodiak:swiftdoc-runner:{{ site.version }}")
+}
+```
+
+```kotlin
+var cacheDir: Path = Files.createTempDirectory("swiftdocCache")
+val runner: SwiftdocInvoker = SwiftdocInvokerImpl(cacheDir)
+
+val outputDir = File("build/swiftdoc").canonicalFile.toPath()
+outputDir.toFile().deleteRecursively()
+outputDir.toFile().mkdirs()
+
+val rootDoc = runner.getRootDoc(
+    listOf(
+        File("src/main/swift").canonicalFile.toPath()
+    ),
+    outputDir
+) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
+
+rootDoc.sourceFiles.forEach { processSourceFile(it) }
+rootDoc.classes.forEach { processClass(it) }
+```
+
+- skip by including `- suppress` in its comments
+    - classes
+    - initializers
+    - fields
+    - methods
+
+- [SourceKitten](https://github.com/jpsim/SourceKitten)
diff --git a/docs/src/orchid/resources/templates/includes/footer.peb b/docs/src/orchid/resources/templates/includes/footer.peb
deleted file mode 100644
index 14be8cf..0000000
--- a/docs/src/orchid/resources/templates/includes/footer.peb
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>
-  &copy;2019 Copper Leaf.
-</p>
-<p>
-  Site proudly built with <a href="https://orchid.netlify.com/">Orchid</a>.<br>
-</p>
-<p>
-  <b>See Also:</b><br>
-  <span class="tag is-light"><a href="https://orchid.netlify.com/">Orchid</a></span>
-  <span class="tag is-light"><a href="https://javaeden.github.io/Clog/">Clog</a></span>
-  <span class="tag is-light"><a href="https://copper-leaf.github.io/krow/">Krow</a></span>
-  <span class="tag is-light"><a href="https://copper-leaf.github.io/kudzu/">Kudzu</a></span>
-  <span class="tag is-light"><a href="https://copper-leaf.github.io/trellis/">Trellis</a></span>
-  <span class="tag is-light"><a href="https://copper-leaf.github.io/kodiak/">Kodiak</a></span>
-</p>
\ No newline at end of file
diff --git a/docs/src/orchid/resources/templates/layouts/base/sidebarBase.peb b/docs/src/orchid/resources/templates/layouts/base/sidebarBase.peb
deleted file mode 100644
index 4302e85..0000000
--- a/docs/src/orchid/resources/templates/layouts/base/sidebarBase.peb
+++ /dev/null
@@ -1,123 +0,0 @@
-{% extends 'layouts/base/layoutBase' %}
-
-{% import 'macros/listMenu' %}
-
-{% block 'body' %}
-<div class="columns is-marginless is-desktop">
-{% block hero %}
-  <div class="column is-one-third-desktop is-one-quarter-widescreen is-one-fifth-fullhd is-paddingless column-main-left is-hidden-mobile is-hidden-touch">
-  {% include 'includes/copper/hero' with {'additionalClasses': 'is-fullheight'} %}
-  </div>
-  <div class="column is-one-third-desktop is-one-quarter-widescreen is-one-fifth-fullhd is-paddingless column-main-left is-hidden-desktop">
-  {% include 'includes/copper/hero' %}
-  </div>
-{% endblock %}
-  <div class="column is-two-thirds-desktop is-three-quarters-widescreen is-four-fifths-fullhd is-paddingless column-main-right">
-  {% include 'includes/copper/navbar' %}
-    <div class="textured container" style="width: 100%;">
-    {# Breadcrumbs #}
-    {% if layoutConfig.includeBreadcrumbs %}
-    {% block breadcrumbs %}
-    {% if layoutConfig.wrapPageInBox or layoutConfig.wrapBreadcrumbsInBox %}
-      <div class="box">
-      {% breadcrumbs %}
-      </div>
-    {% else %}
-    {% breadcrumbs %}
-    {% endif %}
-    {% endblock %}
-    {% endif %}
-
-    {# Main page content #}
-    {% block main %}
-      <article style="position: relative" role="main">
-      {% if layoutConfig.wrapPageInBox %}
-      {% if layoutConfig.includeTitle %}
-        <div class="box" style="position: relative;">
-        {{ _pageTitle(page) }}
-          <hr>
-        {{ _pageBody(page, layoutConfig) }}
-        </div>
-      {% else %}
-        <div class="box">
-        {{ _pageBody(page, layoutConfig) }}
-        </div>
-      {% endif %}
-      {% else %}
-      {% if layoutConfig.includeTitle %}
-      {% if layoutConfig.wrapTitleInBox %}
-        <div class="box">
-        {{ _pageTitle(page) }}
-        </div>
-      {% else %}
-      {{ _pageTitle(page) }}
-        <hr>
-      {% endif %}
-      {% endif %}
-      {{ _pageBody(page, layoutConfig) }}
-      {% endif %}
-      </article>
-    {% endblock %}
-      <div class="grow"></div>
-      <div class="page-footer">
-      {% block footer %}
-        {% include 'includes/copper/mainFooter' %}
-      {% endblock %}
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock %}
-
-{% macro _pageTitle(page) %}
-<h2 class="title is-1 is-spaced">{{ page.title }}</h2>
-<p class="subtitle is-4">{{ page.description }}</p>
-{% endmacro %}
-
-{% macro _pageBody(page, layoutConfig) %}
-{% set hasMenu = layoutConfig.includePageContentsMenu and not layoutConfig.pageContentsMenu.isEmpty() %}
-<div class="columns">
-  <div class="column {% if hasMenu %}is-three-quarters-desktop{% else %}is-full{% endif %}">
-  {% page %}
-  </div>
-  {% if hasMenu %}
-    <div class="column is-one-quarter is-hidden-touch">
-      <div class="sticky-menu" style="position: sticky; top: 30px;">
-      {{- _listMenu(page, layoutConfig.pageContentsMenu) -}}
-      </div>
-      <script>
-        (function () {
-          'use strict';
-
-          var columnMainRight = document.querySelector(".column-main-right");
-          var content = document.querySelector("article[role=main] .content");
-          var menu = document.querySelector("article[role=main] .sticky-menu");
-
-          var section = content.querySelectorAll("h1, h2, h3, h4, h5, h6");
-          var sections = {};
-          var i = 0;
-
-          section.forEach(function (e) {
-            sections[e.id] = e.offsetTop
-          });
-          console.log(sections);
-
-          columnMainRight.addEventListener("scroll", function () {
-            var scrollPosition = columnMainRight.scrollTop;
-            for (i in sections) {
-              if (sections[i] <= scrollPosition) {
-                menu.querySelectorAll('.is-active').forEach(function (e) {
-                  e.classList.remove("is-active")
-                });
-                menu.querySelectorAll('a[href*=' + i + ']').forEach(function (e) {
-                  e.classList.add("is-active")
-                });
-              }
-            }
-          });
-        })();
-      </script>
-    </div>
-  {% endif %}
-</div>
-{% endmacro %}
diff --git a/docs/src/orchid/resources/templates/pages/sourceDocModuleHomepage.peb b/docs/src/orchid/resources/templates/pages/sourceDocModuleHomepage.peb
deleted file mode 100644
index 9c9385d..0000000
--- a/docs/src/orchid/resources/templates/pages/sourceDocModuleHomepage.peb
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="content is-medium-tablet is-large-fullhd">
-{{ page.content | raw }}
-</div>
-
-{% if page.roots is not empty %}
-<p><b>API Documentation:</b></p>
-<ul>
-{%- for root in page.roots %}
-  <li>{{ anchor(root) }}</li>
-{% endfor %}
-</ul>
-{% endif %}
diff --git a/docs/src/orchid/resources/wiki/page-one.md b/docs/src/orchid/resources/wiki/page-one.md
deleted file mode 100644
index 6921cea..0000000
--- a/docs/src/orchid/resources/wiki/page-one.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-TODO
diff --git a/docs/src/orchid/resources/wiki/summary.md b/docs/src/orchid/resources/wiki/summary.md
deleted file mode 100644
index 570378a..0000000
--- a/docs/src/orchid/resources/wiki/summary.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-- [Page One](page-one.md)
diff --git a/dokka/README.md b/dokka/README.md
deleted file mode 100644
index 20d5137..0000000
--- a/dokka/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
----
-
-# Kotlindoc
-
-Uses a Dokka formatter to produce a JSON format that Orchid can use to generate a documentation site.
-
-## Usage
-
-```kotlin
-// build.gradle.kts
-repositories {
-    jcenter()
-}
-dependencies {
-    compile 'com.eden.kodiak:dokka-runner:{{ site.version }}'
-}
-```
-
-```kotlin
-var cacheDir: Path = Files.createTempDirectory("dokkaCache")
-val runner: KotlindocInvoker = KotlindocInvokerImpl(cacheDir)
-
-val outputDir = File("build/dokka").canonicalFile.toPath()
-outputDir.toFile().deleteRecursively()
-outputDir.toFile().mkdirs()
-
-val rootDoc = runner.getRootDoc(
-    listOf(
-        File("src/main/java").canonicalFile.toPath(),
-        File("src/main/kotlin").canonicalFile.toPath()
-    ),
-    outputDir
-) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
-
-rootDoc.packages.forEach { processPackage(it) }
-rootDoc.classes.forEach { processClass(it) }
-```
-
-- skip by including `@suppress` in its comments
-    - classes
-    - constructors
-    - fields
-    - methods
-
-## References
-
-- [Dokka](https://github.com/Kotlin/dokka)
diff --git a/dokka/dokka-formatter/build.gradle.kts b/dokka/dokka-formatter/build.gradle.kts
index 34587f0..bb3d829 100644
--- a/dokka/dokka-formatter/build.gradle.kts
+++ b/dokka/dokka-formatter/build.gradle.kts
@@ -1,10 +1,17 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/formatters.gradle")
-apply(from = "${rootProject.rootDir}/gradle/actions/shadow.gradle")
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-formatters`
+    `copper-leaf-publish`
+    `copper-leaf-shadow`
+}
+
+description = "Kodiak - Dokka Formatter"
 
 dependencies {
-    "implementation"(project(":common:common-formatter"))
-    "implementation"(project(":dokka:dokka-models"))
+    api(project(":dokka:dokka-models"))
 
     // use locally-compiled version of Dokka with the `<ERROR CLASS>` bug fixed, until it"s published
-    "implementation"(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    api(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 }
diff --git a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFileGenerator.kt b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFileGenerator.kt
index a4768ba..4f28ebe 100644
--- a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFileGenerator.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFileGenerator.kt
@@ -1,12 +1,13 @@
 package com.copperleaf.kodiak.kotlin
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.connectAllToParents
 import com.copperleaf.kodiak.kotlin.formatter.qualifiedName
 import com.copperleaf.kodiak.kotlin.formatter.toClassDoc
 import com.copperleaf.kodiak.kotlin.formatter.toPackageDoc
 import com.google.inject.Inject
 import com.google.inject.name.Named
+import kotlinx.serialization.json.Json
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.FileLocation
 import org.jetbrains.dokka.NodeKind
@@ -20,6 +21,12 @@ import java.util.ArrayDeque
 class DokkaJsonFileGenerator @Inject constructor(@Named("outputDir") override val root: File) :
     NodeLocationAwareGenerator {
 
+    val jsonModule = Json {
+        isLenient = true
+        prettyPrint = true
+        ignoreUnknownKeys = true
+    }
+
     override fun location(node: DocumentationNode): FileLocation {
         return FileLocation(fileForNode(node, "json"))
     }
@@ -57,7 +64,7 @@ class DokkaJsonFileGenerator @Inject constructor(@Named("outputDir") override va
                 val file = fileForNode(itemInFile, "Class", "json")
                 file.parentFile?.mkdirsOrFail()
                 try {
-                    file.writeText(itemInFile.toClassDoc(true).toJson())
+                    file.writeText(itemInFile.toClassDoc(true).toJson(jsonModule))
                 } catch (e: Throwable) {
                     println(e)
                 }
@@ -88,7 +95,7 @@ class DokkaJsonFileGenerator @Inject constructor(@Named("outputDir") override va
             val file = fileForNode((it.node as DocumentationNode), "Package", "json")
             file.parentFile?.mkdirsOrFail()
             try {
-                file.writeText(it.toJson())
+                file.writeText(it.toJson(jsonModule))
             } catch (e: Throwable) {
                 println(e)
             }
@@ -96,15 +103,12 @@ class DokkaJsonFileGenerator @Inject constructor(@Named("outputDir") override va
     }
 
     override fun buildOutlines(nodes: Iterable<DocumentationNode>) {
-
     }
 
     override fun buildSupportFiles() {
-
     }
 
     override fun buildPackageList(nodes: Iterable<DocumentationNode>) {
-
     }
 
     private fun File.mkdirsOrFail() {
diff --git a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatDescriptor.kt b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatDescriptor.kt
index 3c3b83f..8fc330e 100644
--- a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatDescriptor.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatDescriptor.kt
@@ -17,7 +17,8 @@ import org.jetbrains.dokka.Utilities.lazyBind
 import org.jetbrains.dokka.Utilities.toOptional
 import org.jetbrains.dokka.Utilities.toType
 
-class DokkaJsonFormatDescriptor : FormatDescriptor,
+class DokkaJsonFormatDescriptor :
+    FormatDescriptor,
     DefaultAnalysisComponent,
     DefaultAnalysisComponentServices by KotlinAsKotlin {
 
@@ -39,4 +40,3 @@ class DokkaJsonFormatDescriptor : FormatDescriptor,
         lazyBind<PackageListService>() toOptional packageListServiceClass
     }
 }
-
diff --git a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatter.kt b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatter.kt
index dad4f78..ccc491f 100644
--- a/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatter.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/DokkaJsonFormatter.kt
@@ -4,21 +4,27 @@ import com.copperleaf.kodiak.kotlin.formatter.classLike
 import com.copperleaf.kodiak.kotlin.formatter.packageLike
 import com.copperleaf.kodiak.kotlin.formatter.toClassDoc
 import com.copperleaf.kodiak.kotlin.formatter.toPackageDoc
+import kotlinx.serialization.json.Json
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.FormattedOutputBuilder
 
 class DokkaJsonFormatter(val to: StringBuilder) : FormattedOutputBuilder {
 
     override fun appendNodes(nodes: Iterable<DocumentationNode>) {
+        val jsonModule = Json {
+            isLenient = true
+            prettyPrint = true
+            ignoreUnknownKeys = true
+        }
+
         val node = nodes.first()
 
         if (node.classLike) {
-            to.append(node.toClassDoc(true).toJson())
+            to.append(node.toClassDoc(true).toJson(jsonModule))
         } else if (node.packageLike) {
-            to.append(node.toPackageDoc(true).toJson())
+            to.append(node.toPackageDoc(true).toJson(jsonModule))
         } else {
             // ignore, we are only documenting classes and packages for now
         }
     }
-
 }
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatClass.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatClass.kt
index 670a1e5..fc963ab 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatClass.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatClass.kt
@@ -11,7 +11,6 @@ import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.path
 import org.jetbrains.dokka.qualifiedNameFromType
-import org.jetbrains.dokka.ignoredSupertypes
 
 val DocumentationNode.classLike: Boolean get() = NodeKind.classLike.contains(this.kind)
 
@@ -27,8 +26,18 @@ fun DocumentationNode.toClassDoc(deep: Boolean): KotlinClass {
     return KotlinClass(
         this,
         this.path.map { it.name }.filterNot { it.isEmpty() }.first(),
-        supertypes.filter { it.second.superclassType != null }.singleOrNull()?.second?.name?.let { RichTextComponent(INHERITED, it, it) },
-        supertypes.filter { it.second.superclassType == null }.toMap().keys.toList()?.map { RichTextComponent(COMPOSED, it, it) },
+        supertypes
+            .filter { it.second.superclassType != null }
+            .singleOrNull()
+            ?.second
+            ?.name
+            ?.let { RichTextComponent(INHERITED, it, it) },
+        supertypes
+            .filter { it.second.superclassType == null }
+            .toMap()
+            .keys
+            .toList()
+            ?.map { RichTextComponent(COMPOSED, it, it) },
         this.kind.toString(),
         this.simpleName,
         this.qualifiedName,
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatCompanionObject.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatCompanionObject.kt
index 98b3f24..a22fe6f 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatCompanionObject.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatCompanionObject.kt
@@ -4,7 +4,8 @@ import com.copperleaf.kodiak.kotlin.models.KotlinClass
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.path
 
-val DocumentationNode.hasCompanionObject: Boolean get() = this.members.any { it.isCompanionMethod || it.isCompanionField }
+val DocumentationNode.hasCompanionObject: Boolean
+    get() = this.members.any { it.isCompanionMethod || it.isCompanionField }
 
 fun DocumentationNode.toCompanionObjectDoc(): KotlinClass {
     assert(this.classLike) { "node must be a Class-like" }
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatConstructor.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatConstructor.kt
index 152b9d8..435b4fe 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatConstructor.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatConstructor.kt
@@ -4,10 +4,6 @@ import com.copperleaf.kodiak.kotlin.models.KotlinConstructor
 import com.copperleaf.kodiak.kotlin.models.KotlinParameter
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
 
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatContent.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatContent.kt
index 8a0822f..dc95f63 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatContent.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatContent.kt
@@ -1,12 +1,9 @@
 package com.copperleaf.kodiak.kotlin.formatter
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.common.CommentTag
 import com.copperleaf.kodiak.common.DocComment
 import org.jetbrains.dokka.ContentBlock
@@ -39,7 +36,6 @@ import org.jetbrains.dokka.ContentUnorderedList
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeRenderContent
 import org.jetbrains.dokka.KotlinLanguageService
-import org.jetbrains.dokka.NodeKind
 
 fun DocumentationNode.getComment(): DocComment {
     val formatter = DokkaContentFormatter(this).apply { extractContent() }
@@ -94,49 +90,49 @@ class DokkaContentFormatter(val node: DocumentationNode) {
 
     private fun extractContentInternal(content: ContentNode, topLevel: Boolean) {
         when (content) {
-            is ContentKeyword               -> content.format(topLevel)
-            is ContentIdentifier            -> content.format(topLevel)
-            is ContentSymbol                -> content.format(topLevel)
-            is ContentEntity                -> content.format(topLevel)
+            is ContentKeyword -> content.format(topLevel)
+            is ContentIdentifier -> content.format(topLevel)
+            is ContentSymbol -> content.format(topLevel)
+            is ContentEntity -> content.format(topLevel)
 
-            is ContentNonBreakingSpace      -> content.format(topLevel)
-            is ContentSoftLineBreak         -> content.format(topLevel)
+            is ContentNonBreakingSpace -> content.format(topLevel)
+            is ContentSoftLineBreak -> content.format(topLevel)
             is ContentIndentedSoftLineBreak -> content.format(topLevel)
-            is ContentHardLineBreak         -> content.format(topLevel)
+            is ContentHardLineBreak -> content.format(topLevel)
 
-            is ContentEmphasis              -> content.format(topLevel)
-            is ContentStrong                -> content.format(topLevel)
-            is ContentStrikethrough         -> content.format(topLevel)
+            is ContentEmphasis -> content.format(topLevel)
+            is ContentStrong -> content.format(topLevel)
+            is ContentStrikethrough -> content.format(topLevel)
 
-            is ContentCode                  -> content.format(topLevel)
-            is ContentBlockCode             -> content.format(topLevel)
+            is ContentCode -> content.format(topLevel)
+            is ContentBlockCode -> content.format(topLevel)
 
-            is ContentNodeDirectLink        -> content.format(topLevel)
-            is ContentNodeLazyLink          -> content.format(topLevel)
-            is NodeRenderContent            -> content.format(topLevel)
-            is ContentExternalLink          -> content.format(topLevel)
-            is ContentNodeLink              -> content.format(topLevel)
+            is ContentNodeDirectLink -> content.format(topLevel)
+            is ContentNodeLazyLink -> content.format(topLevel)
+            is NodeRenderContent -> content.format(topLevel)
+            is ContentExternalLink -> content.format(topLevel)
+            is ContentNodeLink -> content.format(topLevel)
 
-            is ContentUnorderedList         -> content.format(topLevel)
-            is ContentOrderedList           -> content.format(topLevel)
-            is ContentListItem              -> content.format(topLevel)
+            is ContentUnorderedList -> content.format(topLevel)
+            is ContentOrderedList -> content.format(topLevel)
+            is ContentListItem -> content.format(topLevel)
 
-            is ContentHeading               -> content.format(topLevel)
-            is ContentSection               -> content.format(topLevel)
-            is ContentParagraph             -> content.format(topLevel)
+            is ContentHeading -> content.format(topLevel)
+            is ContentSection -> content.format(topLevel)
+            is ContentParagraph -> content.format(topLevel)
 
-            is ContentText                  -> content.format(topLevel)
-            is ContentBlock                 -> content.format(topLevel)
-            is ContentEmpty                 -> content.format(topLevel)
+            is ContentText -> content.format(topLevel)
+            is ContentBlock -> content.format(topLevel)
+            is ContentEmpty -> content.format(topLevel)
 
-            else                            -> {
+            else -> {
                 Clog.e("Unhandled content node: $content (${content.javaClass})")
             }
         }
     }
 
 // Content Node typeName Handlers
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     private fun ContentEmpty.format(topLevel: Boolean) {
         append("")
@@ -200,7 +196,7 @@ class DokkaContentFormatter(val node: DocumentationNode) {
 
     private fun ContentBlockCode.format(topLevel: Boolean) {
         wrap(
-            if(this.language.isNotBlank())
+            if (this.language.isNotBlank())
                 "<pre class=\"language-${this.language}\"><code class=\"language-${this.language}\">"
             else
                 "<pre><code>",
@@ -210,11 +206,12 @@ class DokkaContentFormatter(val node: DocumentationNode) {
 
     private fun ContentNodeLink.format(topLevel: Boolean) {
         if (node != null) {
-            components.add(RichTextComponent(TEXT, currentText, ""))                        // append current text to components list
-            currentText = ""                                                               // get fresh text content
-            joinChildren(this)                                                             // have children append themselved to the context
-            components.add(RichTextComponent(TYPE_NAME, currentText, node!!.qualifiedName)) // convert that text to the text of the link component
-            currentText = ""                                                               // prepare to continue with later components
+            components.add(RichTextComponent(TEXT, currentText, "")) // append current text to components list
+            currentText = "" // get fresh text content
+            joinChildren(this) // have children append themselved to the context
+            components // convert that text to the text of the link component
+                .add(RichTextComponent(TYPE_NAME, currentText, node!!.qualifiedName))
+            currentText = "" // prepare to continue with later components
         } else {
             joinChildren(this)
         }
@@ -229,7 +226,7 @@ class DokkaContentFormatter(val node: DocumentationNode) {
     }
 
     private fun ContentExternalLink.format(topLevel: Boolean) {
-        wrap("<a href=\"${this.href}\">", "</a>") { joinChildren(this)}
+        wrap("<a href=\"${this.href}\">", "</a>") { joinChildren(this) }
     }
 
     private fun ContentUnorderedList.format(topLevel: Boolean) {
@@ -244,9 +241,9 @@ class DokkaContentFormatter(val node: DocumentationNode) {
         val child = this.children.singleOrNull()
         if (child is ContentParagraph) {
             // Ignore paragraph if item is nested underneath an item
-            wrap("<li>", "</li>") { joinChildren(child)}
+            wrap("<li>", "</li>") { joinChildren(child) }
         } else {
-            wrap("<li>", "</li>") { joinChildren(this)}
+            wrap("<li>", "</li>") { joinChildren(this) }
         }
     }
 
@@ -259,12 +256,12 @@ class DokkaContentFormatter(val node: DocumentationNode) {
     }
 
 // Helper Methods
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     private fun append(text: String) {
         currentText += text
     }
-    private fun wrap(prefix: String, suffix: String, body: ()->Unit) {
+    private fun wrap(prefix: String, suffix: String, body: () -> Unit) {
         append(prefix)
         body()
         append(suffix)
@@ -273,5 +270,4 @@ class DokkaContentFormatter(val node: DocumentationNode) {
     private fun joinChildren(block: ContentBlock) {
         block.children.forEach { extractContentInternal(it, topLevel = false) }
     }
-
 }
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatEnum.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatEnum.kt
index de33ea2..72f78f5 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatEnum.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatEnum.kt
@@ -2,10 +2,6 @@ package com.copperleaf.kodiak.kotlin.formatter
 
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinEnumConstant
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
@@ -25,7 +21,7 @@ fun DocumentationNode.toEnumConstantDoc(): KotlinEnumConstant {
     )
 }
 
-fun DocumentationNode.enumConstantSignature() : List<RichTextComponent> {
+fun DocumentationNode.enumConstantSignature(): List<RichTextComponent> {
     return listOf(
         RichTextComponent(TEXT, this.simpleName)
     )
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatField.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatField.kt
index 8221077..a47de52 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatField.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatField.kt
@@ -2,10 +2,7 @@ package com.copperleaf.kodiak.kotlin.formatter
 
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinField
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
@@ -37,10 +34,9 @@ fun DocumentationNode.fieldSignature(
 ): List<RichTextComponent> {
     val list = mutableListOf<RichTextComponent>()
 
-    if(modifiers.isEmpty()) {
+    if (modifiers.isEmpty()) {
         list.add(RichTextComponent(TEXT, "val "))
-    }
-    else {
+    } else {
         list.addAll(modifiers.toModifierListSignature())
     }
 
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatHelpers.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatHelpers.kt
index 151884b..8031d36 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatHelpers.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatHelpers.kt
@@ -7,7 +7,7 @@ import org.jetbrains.dokka.path
 import org.jetbrains.dokka.qualifiedNameFromType
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 
 val DocumentationNode.modifiers: List<String>
     get() = this.details(NodeKind.Modifier)
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatMethod.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatMethod.kt
index 3c2ea70..fa1811f 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatMethod.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatMethod.kt
@@ -2,10 +2,7 @@ package com.copperleaf.kodiak.kotlin.formatter
 
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinMethod
 import com.copperleaf.kodiak.kotlin.models.KotlinParameter
 import com.copperleaf.kodiak.kotlin.models.KotlinReceiver
@@ -101,4 +98,3 @@ val DocumentationNode.receiverType: KotlinReceiver?
                 it.asType().toTypeSignature()
             )
     }
-
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatPackage.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatPackage.kt
index 02556d8..7ce5486 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatPackage.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatPackage.kt
@@ -3,9 +3,6 @@ package com.copperleaf.kodiak.kotlin.formatter
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinPackage
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
@@ -26,13 +23,13 @@ fun DocumentationNode.toPackageDoc(deep: Boolean): KotlinPackage {
         emptyList(),
         if (deep) run {
             val internalMethods = this.members
-                    .filter { it.isMethod }
-                    .map { it.toMethod() }
+                .filter { it.isMethod }
+                .map { it.toMethod() }
             val externalMethods = this.members
-                    .filter { it.kind == NodeKind.ExternalClass }
-                    .flatMap { it.members }
-                    .filter { it.isMethod }
-                    .map { it.toMethod() }
+                .filter { it.kind == NodeKind.ExternalClass }
+                .flatMap { it.members }
+                .filter { it.isMethod }
+                .map { it.toMethod() }
             internalMethods + externalMethods
         } else emptyList(),
         if (deep) this.members.filter { it.isField }.map { it.toField() } else emptyList(),
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatParameters.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatParameters.kt
index ef52327..32c2120 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatParameters.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatParameters.kt
@@ -4,8 +4,6 @@ import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinParameter
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
@@ -133,9 +131,8 @@ fun DocumentationNode.toFunctionalTypeSignature(): List<RichTextComponent> {
     return list
 }
 
-
 // Type Params
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
 fun DocumentationNode.toTypeParameterDeclarationSignature(): List<RichTextComponent> {
     val list = mutableListOf<RichTextComponent>()
diff --git a/dokka/dokka-formatter/src/main/kotlin/formatter/formatTypealias.kt b/dokka/dokka-formatter/src/main/kotlin/formatter/formatTypealias.kt
index 97f72f3..9adc220 100644
--- a/dokka/dokka-formatter/src/main/kotlin/formatter/formatTypealias.kt
+++ b/dokka/dokka-formatter/src/main/kotlin/formatter/formatTypealias.kt
@@ -4,8 +4,6 @@ import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.PUNCTUATION
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.INHERITED
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.COMPOSED
 import com.copperleaf.kodiak.kotlin.models.KotlinTypealias
 import org.jetbrains.dokka.DocumentationNode
 import org.jetbrains.dokka.NodeKind
diff --git a/dokka/dokka-models/build.gradle.kts b/dokka/dokka-models/build.gradle.kts
index 9d0d56c..7324249 100644
--- a/dokka/dokka-models/build.gradle.kts
+++ b/dokka/dokka-models/build.gradle.kts
@@ -1,5 +1,9 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/models.gradle")
-
-dependencies {
-    "compile"(project(":common:common-models"))
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-models`
+    `copper-leaf-publish`
 }
+
+description = "Kodiak - Dokka Models"
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinClass.kt b/dokka/dokka-models/src/main/kotlin/KotlinClass.kt
index 635ee11..41b9219 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinClass.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinClass.kt
@@ -1,16 +1,17 @@
 package com.copperleaf.kodiak.kotlin.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDoc
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -40,30 +41,31 @@ data class KotlinClass(
 
     val companionObject: KotlinClass?,
     val enumItems: List<KotlinEnumConstant>
-) : DocElement, AutoDocument, TopLevel {
+) : DocElement, AutoDocument, TopLevel, JsonableDocElement {
 
-    override val parents = listOfNotNull(superclass, *interfaces.toTypedArray())
-    override val contexts = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+    override val parents: List<RichTextComponent>
+        get() = listOfNotNull(superclass, *interfaces.toTypedArray())
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::enumItems),
-        fromDocList(::fields),
-        fromDocList(::constructors),
-        fromDocList(::methods),
-        fromDocList(::extensions),
-        fromDoc(::companionObject)
-    )
+    override val contexts: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::enumItems),
+            fromDocList(::fields),
+            fromDocList(::constructors),
+            fromDocList(::methods),
+            fromDocList(::extensions),
+            fromDoc(::companionObject)
+        )
 
-    @UseExperimental(UnstableDefault::class)
     companion object {
         fun fromJson(json: String): KotlinClass {
-            return Json.parse(KotlinClass.serializer(), json)
+            return Json.decodeFromString(KotlinClass.serializer(), json)
         }
     }
 
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(KotlinClass.serializer(), this)
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinConstructor.kt b/dokka/dokka-models/src/main/kotlin/KotlinConstructor.kt
index 26f2b84..1b187d3 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinConstructor.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinConstructor.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.kotlin.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -14,7 +15,7 @@ import kotlinx.serialization.Transient
 @Serializable
 data class KotlinConstructor(
     @Transient
-        val node: Any? = null,
+    val node: Any? = null,
 
     override val name: String,
     override val id: String,
@@ -26,8 +27,8 @@ data class KotlinConstructor(
 ) : DocElement, AutoDocument {
     override val kind = "Constructor"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters)
+        )
 }
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinField.kt b/dokka/dokka-models/src/main/kotlin/KotlinField.kt
index 3b67fc0..9b84315 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinField.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinField.kt
@@ -2,9 +2,9 @@ package com.copperleaf.kodiak.kotlin.models
 
 import com.copperleaf.kodiak.common.AutoDocument
 import com.copperleaf.kodiak.common.AutoDocumentNode
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
@@ -27,6 +27,6 @@ data class KotlinField(
 ) : ElementType, AutoDocument {
     override val kind = "Field"
 
-    @Transient
-    override val nodes = emptyList<AutoDocumentNode>()
+    override val nodes: List<AutoDocumentNode>
+        get() = emptyList()
 }
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinMethod.kt b/dokka/dokka-models/src/main/kotlin/KotlinMethod.kt
index 3e1a918..c2be58b 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinMethod.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinMethod.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.kotlin.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDoc
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
@@ -29,10 +30,10 @@ data class KotlinMethod(
 ) : DocElement, AutoDocument {
     override val kind = "Method"
 
-    @Transient
-    override val nodes = listOf(
-        fromDoc(::receiver),
-        fromDocList(::parameters),
-        fromDoc(::returnValue)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDoc(::receiver),
+            fromDocList(::parameters),
+            fromDoc(::returnValue)
+        )
 }
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinModuleDoc.kt b/dokka/dokka-models/src/main/kotlin/KotlinModuleDoc.kt
index ca654d7..ada0661 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinModuleDoc.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinModuleDoc.kt
@@ -1,5 +1,6 @@
 package com.copperleaf.kodiak.kotlin.models
 
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.ModuleDoc
 import com.copperleaf.kodiak.common.fromDocList
@@ -12,10 +13,11 @@ class KotlinModuleDoc(
     val classes: List<KotlinClass>
 ) : ModuleDoc {
 
-    override val nodes = listOf(
-        fromDocList(::packages),
-        fromDocList(::classes)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::packages),
+            fromDocList(::classes)
+        )
 
     override fun roots(): List<DocElement> {
         return packages.filter { it.parent.isBlank() }
diff --git a/dokka/dokka-models/src/main/kotlin/KotlinPackage.kt b/dokka/dokka-models/src/main/kotlin/KotlinPackage.kt
index 5d5c17f..802b817 100644
--- a/dokka/dokka-models/src/main/kotlin/KotlinPackage.kt
+++ b/dokka/dokka-models/src/main/kotlin/KotlinPackage.kt
@@ -1,15 +1,16 @@
 package com.copperleaf.kodiak.kotlin.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -33,30 +34,31 @@ data class KotlinPackage(
     val fields: List<KotlinField>,
     val typealiases: List<KotlinTypealias>,
     override val signature: List<RichTextComponent>
-) : DocElement, AutoDocument, TopLevel {
+) : DocElement, AutoDocument, TopLevel, JsonableDocElement {
     override val kind = "Package"
 
-    override val parents = listOf(RichTextComponent(TYPE_NAME, parent, parent))
-    override val contexts = emptyList<RichTextComponent>()
+    override val parents: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, parent, parent))
+
+    override val contexts: List<RichTextComponent>
+        get() = emptyList<RichTextComponent>()
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::classes),
+            fromDocList(::subpackages),
+            fromDocList(::typealiases),
+            fromDocList(::fields),
+            fromDocList(::methods)
+        )
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::classes),
-        fromDocList(::subpackages),
-        fromDocList(::typealiases),
-        fromDocList(::fields),
-        fromDocList(::methods)
-    )
-
-    @UseExperimental(UnstableDefault::class)
     companion object {
         fun fromJson(json: String): KotlinPackage {
-            return Json.parse(KotlinPackage.serializer(), json)
+            return Json.decodeFromString(KotlinPackage.serializer(), json)
         }
     }
 
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(KotlinPackage.serializer(), this)
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/dokka/dokka-runner/build.gradle.kts b/dokka/dokka-runner/build.gradle.kts
index b6bc396..eba10e1 100644
--- a/dokka/dokka-runner/build.gradle.kts
+++ b/dokka/dokka-runner/build.gradle.kts
@@ -1,8 +1,13 @@
 plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-runners`
+    `copper-leaf-publish`
     id("org.jetbrains.dokka") version "0.9.18"
 }
 
-apply(from = "${rootProject.rootDir}/gradle/groups/runners.gradle")
+description = "Kodiak - Dokka Runner"
 
 dependencies {
     "compile"(project(":common:common-runner"))
@@ -12,16 +17,14 @@ dependencies {
 // wait to build this project until after the formatter is built, because we want to bundle the formatter as a resource
 // in this project
 val formatterProject = project(":dokka:dokka-formatter")
+val formatterProjectShadowJar by formatterProject.tasks.named("shadowJar")
 
-val thisProjectAssemble = tasks.getByName("assemble")
-val formatterProjectAssemble = formatterProject.tasks.getByName("assemble")
-thisProjectAssemble.dependsOn(formatterProjectAssemble)
-
-(tasks.getByName("processResources") as ProcessResources).apply {
+tasks.withType<ProcessResources> {
+    dependsOn(formatterProjectShadowJar)
     from("${formatterProject.buildDir}/libs/dokka-formatter-$version-all.zip")
 }
 
-(tasks.getByName("dokka") as org.jetbrains.dokka.gradle.DokkaTask).apply {
+tasks.withType<org.jetbrains.dokka.gradle.DokkaTask> {
     outputFormat = "html"
     outputDirectory = "$buildDir/dokka/compare"
 
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassGenerics.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassGenerics.kt
index 0cf8ea4..572a33c 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassGenerics.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassGenerics.kt
@@ -40,7 +40,6 @@ constructor(s1: T?) {
      */
     lateinit var someData5: List<T>
 
-
     /**
      * This class _freaking awesome_ method links to [KotlinInterface], **yo**!
      *
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithCompanionObject.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithCompanionObject.kt
index 8863756..3a0dfd1 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithCompanionObject.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithCompanionObject.kt
@@ -4,8 +4,8 @@ class KotlinClassWithCompanionObject {
 
     companion object {
         const val companionObjectVariable: String = ""
-        fun companionObjectFunction() : String {
+        fun companionObjectFunction(): String {
             return companionObjectVariable
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithLibraryClasses.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithLibraryClasses.kt
index 48409cd..9afbe71 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithLibraryClasses.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinClassWithLibraryClasses.kt
@@ -3,8 +3,7 @@ package com.copperleaf.kodiak
 import java.util.Collections.emptyList
 
 class KotlinClassWithLibraryClasses
-    (var value: MissingClassInConstructor)
-{
+(var value: MissingClassInConstructor) {
     fun method1(): MissingClassInDeclaredReturnType = MissingClassInDeclaredReturnType()
 
     fun method2() = MissingClassInInferredReturnType().getSomeOtherProperty() + "appended expression value"
@@ -13,20 +12,19 @@ class KotlinClassWithLibraryClasses
 
     fun <T : MissingClassInTypeParameter> method4(input: T) { }
 
-    fun method5() : List<MissingClassAsGeneric> { return emptyList() }
+    fun method5(): List<MissingClassAsGeneric> { return emptyList() }
 
     fun MissingClassReceiver.method6() { }
 
-    fun method7(block: MissingClassLambdaReceiver.()->Unit) { }
+    fun method7(block: MissingClassLambdaReceiver.() -> Unit) { }
 
-    fun method8(block: (MissingClassLambdaParameter)->Unit) { }
+    fun method8(block: (MissingClassLambdaParameter) -> Unit) { }
 
-    fun method9(block: ()->MissingClassLambdaReturnType) { }
+    fun method9(block: () -> MissingClassLambdaReturnType) { }
 
     val prop1: MissingClassInDeclaredPropertyType = MissingClassInDeclaredPropertyType()
 
     val prop2 = MissingClassInInferredPropertyType()
 
     val prop3 get() = MissingClassInInferredPropertyGetterType()
-
 }
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinFunctions.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinFunctions.kt
index 847d3e2..3062792 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinFunctions.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinFunctions.kt
@@ -26,6 +26,6 @@ fun String.stringClassExtensionMethod(input: String): String {
 /**
  * A method with a receiver, defined outside of any class, just in the package.
  */
-fun methodWithReceiver(input: (String)->Int): Int {
+fun methodWithReceiver(input: (String) -> Int): Int {
     return input("")
-}
\ No newline at end of file
+}
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinInlineClass.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinInlineClass.kt
index b71b343..1d81894 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinInlineClass.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinInlineClass.kt
@@ -1,3 +1,3 @@
 package com.copperleaf.kodiak
 
-inline class KotlinInlineClass(val value: Int)
\ No newline at end of file
+inline class KotlinInlineClass(val value: Int)
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinMarkdown.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinMarkdown.kt
index 8604041..3a30e94 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinMarkdown.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinMarkdown.kt
@@ -33,8 +33,4 @@ package com.copperleaf.kodiak
  * @since v1.0.0
  * @orchidApi extensible
  */
-class KotlinMarkdown {
-
-
-
-}
\ No newline at end of file
+class KotlinMarkdown
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinObjectClass.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinObjectClass.kt
index c2fb190..e87341b 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinObjectClass.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinObjectClass.kt
@@ -4,7 +4,7 @@ object KotlinObjectClass {
 
     const val objectVariable: String = ""
 
-    fun objectFunction() : String {
+    fun objectFunction(): String {
         return objectVariable
     }
 }
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinSealedClasses.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinSealedClasses.kt
index 858b6ab..ccb5826 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinSealedClasses.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinSealedClasses.kt
@@ -3,4 +3,4 @@ package com.copperleaf.kodiak
 sealed class KotlinSealedClasses
 class KotlinSealedClass1 : KotlinSealedClasses()
 class KotlinSealedClass2 : KotlinSealedClasses()
-class KotlinSealedClass3 : KotlinSealedClasses()
\ No newline at end of file
+class KotlinSealedClass3 : KotlinSealedClasses()
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinTypeAliases.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinTypeAliases.kt
index 520a61a..9eab9a5 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinTypeAliases.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/KotlinTypeAliases.kt
@@ -2,4 +2,4 @@ package com.copperleaf.kodiak
 
 typealias TypealiasedString = String
 
-typealias TypealiasedKotlinClass = KotlinClass
\ No newline at end of file
+typealias TypealiasedKotlinClass = KotlinClass
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/KotlinSubclassOne.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/KotlinSubclassOne.kt
index 4acdc93..6888c3f 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/KotlinSubclassOne.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/KotlinSubclassOne.kt
@@ -1,5 +1,3 @@
-package com.copperleaf.kodiak.one;
+package com.copperleaf.kodiak.one
 
-public class KotlinSubclassOne {
-
-}
+public class KotlinSubclassOne
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/three/four/five/KotlinSubclassFour.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/three/four/five/KotlinSubclassFour.kt
index c4c9914..9a01443 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/three/four/five/KotlinSubclassFour.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/three/four/five/KotlinSubclassFour.kt
@@ -1,5 +1,3 @@
-package com.copperleaf.kodiak.one.three.four.five;
+package com.copperleaf.kodiak.one.three.four.five
 
-public class KotlinSubclassFour {
-
-}
+public class KotlinSubclassFour
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/KotlinSubclassTwo.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/KotlinSubclassTwo.kt
index eba50d8..e9fb883 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/KotlinSubclassTwo.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/KotlinSubclassTwo.kt
@@ -1,5 +1,3 @@
-package com.copperleaf.kodiak.one.two;
+package com.copperleaf.kodiak.one.two
 
-public class KotlinSubclassTwo {
-
-}
+public class KotlinSubclassTwo
diff --git a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/three/four/five/KotlinSubclassThree.kt b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/three/four/five/KotlinSubclassThree.kt
index 1592cce..91e98c9 100644
--- a/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/three/four/five/KotlinSubclassThree.kt
+++ b/dokka/dokka-runner/src/example/kotlin/com/copperleaf/kodiak/one/two/three/four/five/KotlinSubclassThree.kt
@@ -1,5 +1,3 @@
-package com.copperleaf.kodiak.one.two.three.four.five;
+package com.copperleaf.kodiak.one.two.three.four.five
 
-public class KotlinSubclassThree {
-
-}
+public class KotlinSubclassThree
diff --git a/dokka/dokka-runner/src/main/kotlin/lib.kt b/dokka/dokka-runner/src/main/kotlin/KotlindocInvokerImpl.kt
similarity index 78%
rename from dokka/dokka-runner/src/main/kotlin/lib.kt
rename to dokka/dokka-runner/src/main/kotlin/KotlindocInvokerImpl.kt
index f9173d3..86b9502 100644
--- a/dokka/dokka-runner/src/main/kotlin/lib.kt
+++ b/dokka/dokka-runner/src/main/kotlin/KotlindocInvokerImpl.kt
@@ -30,15 +30,15 @@ class KotlindocInvokerImpl(
         return arrayOf(
             "java",
             "-Xms$startMemory", "-Xmx$maxMemory",
-            "-classpath", formatterJar.toFile().absolutePath,   // classpath of embedded formatter jar
-            "org.jetbrains.dokka.MainKt",                       // Dokka main class
+            "-classpath", formatterJar.toFile().absolutePath, // classpath of embedded formatter jar
+            "org.jetbrains.dokka.MainKt", // Dokka main class
             "-pass",
-            "-format", "json",                                  // JSON format (so we can pick up results afterwards)
+            "-format", "json", // JSON format (so we can pick up results afterwards)
             "-noStdlibLink",
             "-analysisPlatform", "JVM",
             *sourceDirs.flatMap { listOf("-src", it.toFile().absolutePath) }.toTypedArray(), // the sources to process
-            "-output", destinationDir.toFile().absolutePath,    // where Orchid will find them later
-            *args.toTypedArray()                                // allow additional arbitrary args
+            "-output", destinationDir.toFile().absolutePath, // where Orchid will find them later
+            *args.toTypedArray() // allow additional arbitrary args
         )
     }
 
@@ -48,5 +48,4 @@ class KotlindocInvokerImpl(
             getDocsInSubdirectory(destinationDir, "Class", KotlinClass.serializer())
         )
     }
-
 }
diff --git a/dokka/dokka-runner/src/test/kotlin/DokkaJsonRunnerTest.kt b/dokka/dokka-runner/src/test/kotlin/DokkaJsonRunnerTest.kt
index 1a75338..1b1d201 100644
--- a/dokka/dokka-runner/src/test/kotlin/DokkaJsonRunnerTest.kt
+++ b/dokka/dokka-runner/src/test/kotlin/DokkaJsonRunnerTest.kt
@@ -3,15 +3,14 @@ package com.copperleaf.kodiak.kotlin
 import com.copperleaf.kodiak.common.DocInvoker
 import com.copperleaf.kodiak.kotlin.models.KotlinModuleDoc
 import com.eden.common.util.IOStreamUtils
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.assertions.isNotEmpty
-import strikt.assertions.isNotNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 class DokkaJsonRunnerTest {
 
@@ -39,16 +38,15 @@ class DokkaJsonRunnerTest {
     }
 
     private fun cleanupProjectDirs() {
-
     }
 
-    @BeforeEach
+    @Before
     internal fun setUp() {
         if (useTempDirs) initTempDirs() else initProjectDirs()
         dokkaRunner = KotlindocInvokerImpl(cacheDir)
     }
 
-    @AfterEach
+    @After
     internal fun tearDown() {
         if (useTempDirs) cleanupTempDirs() else cleanupProjectDirs()
     }
@@ -63,10 +61,8 @@ class DokkaJsonRunnerTest {
             outputDir
         ) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
 
-        expectThat(rootDoc)
-            .isNotNull()
-            .and { get { packages }.isNotEmpty() }
-            .and { get { classes }.isNotEmpty() }
+        assertNotNull(rootDoc)
+        assertTrue(rootDoc.packages.isNotEmpty())
+        assertTrue(rootDoc.classes.isNotEmpty())
     }
-
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..30b3623
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,12 @@
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+android.injected.testOnly=false
+android.useAndroidX=true
+org.gradle.configureondemand=false
+org.gradle.caching=true
+org.gradle.parallel=true
+android.enableBuildCache=true
+org.gradle.internal.publish.checksums.insecure=true
+kotlin.mpp.stability.nowarn=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.enableCompatibilityMetadataVariant=true
diff --git a/gradle/actions/publish.gradle b/gradle/actions/publish.gradle
deleted file mode 100644
index 613adab..0000000
--- a/gradle/actions/publish.gradle
+++ /dev/null
@@ -1,89 +0,0 @@
-// Javadoc and Orchid
-//----------------------------------------------------------------------------------------------------------------------
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from project.sourceSets.main.allSource
-}
-
-artifacts {
-    archives sourcesJar
-}
-
-// Deployment
-//----------------------------------------------------------------------------------------------------------------------
-
-def pomConfig = {
-    scm {
-        url "https://github.com/${rootProject.ext.github_project}.git"
-        connection "https://github.com/${rootProject.ext.github_project}.git"
-        developerConnection "https://github.com/${rootProject.ext.github_project}.git"
-    }
-    licenses {
-        license {
-            name rootProject.ext.license.name
-            url rootProject.ext.license.url
-            distribution "repo"
-        }
-    }
-    developers {
-        developer {
-            id rootProject.ext.developer_id
-            name rootProject.ext.developer_name
-            email rootProject.ext.developer_email
-        }
-    }
-}
-
-publishing {
-    publications {
-        ProjectPublication(MavenPublication) {
-            from project.components.java
-            artifact project.sourcesJar
-            groupId project.group
-            artifactId project.name
-            version project.version
-            pom.withXml {
-                def root = asNode()
-                root.appendNode("description", rootProject.ext.project_description)
-                root.appendNode("name", rootProject.ext.project_name)
-                root.appendNode("url", "https://copper-leaf.github.io/kodiak")
-                root.children().last() + pomConfig
-            }
-        }
-    }
-}
-
-bintray {
-    user = rootProject.ext.bintray_username
-    key = rootProject.ext.bintray_api_key
-    publications = ["ProjectPublication"]
-
-    dryRun = rootProject.ext.dry_deploy
-    publish = !rootProject.ext.dry_deploy
-    override = true
-
-    pkg {
-        repo = rootProject.ext.bintray_repo
-        name = project.name
-        userOrg = rootProject.ext.bintray_user_org
-        licenses = [rootProject.ext.license.name]
-        vcsUrl = "https://github.com/${rootProject.ext.github_project}.git"
-
-        version {
-            name = "${project.version}"
-            desc = "${project.name} ${project.version}"
-            released = new Date()
-
-            gpg {
-                sign = true
-            }
-            mavenCentralSync {
-                sync = rootProject.ext.maven_central_sync
-                user = rootProject.ext.maven_central_username
-                password = rootProject.ext.maven_central_password
-            }
-        }
-    }
-}
-project.tasks.publish.dependsOn bintrayUpload
diff --git a/gradle/actions/shadow.gradle b/gradle/actions/shadow.gradle
deleted file mode 100644
index 6f3582c..0000000
--- a/gradle/actions/shadow.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-apply plugin: "com.github.johnrengelman.shadow"
-
-tasks.assemble.dependsOn shadowJar
-
-shadowJar {
-    version = rootProject.version
-    extension = "zip"
-}
diff --git a/gradle/groups/formatters.gradle b/gradle/groups/formatters.gradle
deleted file mode 100644
index 037830d..0000000
--- a/gradle/groups/formatters.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-apply plugin: "kotlin"
-apply plugin: "kotlinx-serialization"
-apply plugin: "com.jfrog.bintray"
-apply plugin: "maven-publish"
-
-group rootProject.group
-version rootProject.version
-
-sourceCompatibility = 1.8
-
-repositories {
-    jcenter()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    api(Libs.com_eden_common)
-    api(Libs.clog4j)
-    api(Libs.kotlin_reflect)
-
-    // testing
-    testRuntimeOnly(Libs.junit_jupiter_engine)
-    testCompile(Libs.junit_jupiter_api)
-    testCompile(Libs.strikt_core)
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-test {
-    useJUnitPlatform()
-    testLogging {
-        showStandardStreams = true
-    }
-}
-test.outputs.upToDateWhen {false}
-
-apply from: "${rootProject.rootDir}/gradle/actions/publish.gradle"
diff --git a/gradle/groups/models.gradle b/gradle/groups/models.gradle
deleted file mode 100644
index 3d9acb5..0000000
--- a/gradle/groups/models.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-apply plugin: "kotlin"
-apply plugin: "kotlinx-serialization"
-apply plugin: "com.jfrog.bintray"
-apply plugin: "maven-publish"
-
-group rootProject.group
-version rootProject.version
-
-sourceCompatibility = 1.8
-
-repositories {
-    jcenter()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    compile(Libs.kotlin_stdlib_jdk8)
-    compile(Libs.kotlin_reflect)
-    compile(Libs.kotlinx_serialization_runtime)
-
-    // testing
-    testRuntimeOnly(Libs.junit_jupiter_engine)
-    testCompile(Libs.junit_jupiter_api)
-    testCompile(Libs.strikt_core)
-    testCompile(Libs.com_eden_common)
-    testCompile(Libs.clog4j)
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-test {
-    useJUnitPlatform()
-    testLogging {
-        showStandardStreams = true
-    }
-}
-test.outputs.upToDateWhen {false}
-
-apply from: "${rootProject.rootDir}/gradle/actions/publish.gradle"
diff --git a/gradle/groups/runners.gradle b/gradle/groups/runners.gradle
deleted file mode 100644
index e8d7928..0000000
--- a/gradle/groups/runners.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-apply plugin: "kotlin"
-apply plugin: "com.jfrog.bintray"
-apply plugin: "maven-publish"
-
-group rootProject.group
-version rootProject.version
-
-sourceCompatibility = 1.8
-
-repositories {
-    jcenter()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    compile project(":common:common-models")
-
-    // testing
-    testRuntimeOnly(Libs.junit_jupiter_engine)
-    testCompile(Libs.junit_jupiter_api)
-    testCompile(Libs.strikt_core)
-    testCompile(Libs.com_eden_common)
-    testCompile(Libs.clog4j)
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions {
-        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
-    }
-}
-test {
-    useJUnitPlatform()
-    testLogging {
-        showStandardStreams = true
-    }
-}
-sourceSets {
-    example
-}
-test.outputs.upToDateWhen {false}
-
-apply from: "${rootProject.rootDir}/gradle/actions/publish.gradle"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbe85ee..1c4bcc2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/groovydoc/README.md b/groovydoc/README.md
deleted file mode 100644
index 5d6a627..0000000
--- a/groovydoc/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
----
-
-# Groovydoc
-
-Uses a Groovy's Groovydoc APIs to produce a JSON format that Orchid can use to generate a documentation site.
-
-## Usage
-
-```kotlin
-// build.gradle.kts
-repositories {
-    jcenter()
-}
-dependencies {
-    compile 'com.eden.kodiak:groovydoc-runner:{{ site.version }}'
-}
-```
-
-```kotlin
-var cacheDir: Path = Files.createTempDirectory("groovydocCache")
-val runner: GroovydocInvoker = GroovydocInvokerImpl(cacheDir)
-
-val outputDir = File("build/groovydoc").canonicalFile.toPath()
-outputDir.toFile().deleteRecursively()
-outputDir.toFile().mkdirs()
-
-val rootDoc = runner.getRootDoc(
-    listOf(
-        File("src/main/java").canonicalFile.toPath(),
-        File("src/main/groovy").canonicalFile.toPath()
-    ),
-    outputDir
-) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
-
-rootDoc.packages.forEach { processPackage(it) }
-rootDoc.classes.forEach { processClass(it) }
-```
-
-- skip by including `@suppress` in its comments
-    - classes
-    - constructors
-    - fields
-    - methods
-
-## References
-
-- [Groovydoc](http://docs.groovy-lang.org/docs/next/html/documentation/#_groovydoc_the_groovy_java_documentation_generator)
diff --git a/groovydoc/groovydoc-formatter/build.gradle.kts b/groovydoc/groovydoc-formatter/build.gradle.kts
index f45b706..054c6ff 100644
--- a/groovydoc/groovydoc-formatter/build.gradle.kts
+++ b/groovydoc/groovydoc-formatter/build.gradle.kts
@@ -1,10 +1,16 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/formatters.gradle")
-apply(from = "${rootProject.rootDir}/gradle/actions/shadow.gradle")
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-formatters`
+    `copper-leaf-publish`
+    `copper-leaf-shadow`
+}
+
+description = "Kodiak - Groovydoc Formatter"
 
 dependencies {
-    "implementation"(project(":common:common-formatter"))
-    "implementation"(project(":groovydoc:groovydoc-models"))
-    
-    "implementation"(Libs.groovy_all)
-    "implementation"(Libs.jsoup)
+    api(project(":groovydoc:groovydoc-models"))
+    api("org.codehaus.groovy:groovy-all:2.5.8")
+    api("org.jsoup:jsoup:1.12.1")
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonTool.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/GroovyDocJsonTool.kt
similarity index 80%
rename from groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonTool.kt
rename to groovydoc/groovydoc-formatter/src/main/kotlin/GroovyDocJsonTool.kt
index e4e2a79..933c9c3 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonTool.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/GroovyDocJsonTool.kt
@@ -1,12 +1,13 @@
 package com.copperleaf.kodiak.groovy
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.connectAllToParents
 import com.copperleaf.kodiak.groovy.formatter.isSuppressed
 import com.copperleaf.kodiak.groovy.formatter.toClassDoc
 import com.copperleaf.kodiak.groovy.formatter.toPackageDoc
 import com.copperleaf.kodiak.groovy.models.GroovyClass
 import com.copperleaf.kodiak.groovy.models.GroovyPackage
+import kotlinx.serialization.json.Json
 import org.codehaus.groovy.groovydoc.GroovyPackageDoc
 import org.codehaus.groovy.groovydoc.GroovyRootDoc
 import org.codehaus.groovy.tools.groovydoc.ClasspathResourceManager
@@ -30,10 +31,16 @@ class GroovyDocJsonTool(
 ) {
 
 // Get RootDoc model from Groovy APIs
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     private val rootDocBuilder = GroovyRootDocBuilder(this, sourcepaths, emptyList(), properties)
 
+    val jsonModule = Json {
+        isLenient = true
+        prettyPrint = true
+        ignoreUnknownKeys = true
+    }
+
     override fun getRootDoc(): GroovyRootDoc {
         return rootDocBuilder.rootDoc
     }
@@ -49,18 +56,18 @@ class GroovyDocJsonTool(
     }
 
 // Write classes and packages to JSON files
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
     private fun writeClasses(output: OutputTool, rootDoc: GroovyRootDoc, destdir: String) {
         rootDoc
             .classes()
             .filter {
                 when {
-                    (it.isPublic)                                                                             -> true
-                    (it.isProtected      && (properties.getProperty("protectedScope")?.toBoolean() ?: false)) -> true
-                    (it.isPackagePrivate && (properties.getProperty("packageScope")?.toBoolean()   ?: false)) -> true
-                    (it.isPrivate        && (properties.getProperty("privateScope")?.toBoolean()   ?: false)) -> true
-                    else                                                                                      -> false
+                    (it.isPublic) -> true
+                    (it.isProtected && (properties.getProperty("protectedScope")?.toBoolean() ?: false)) -> true
+                    (it.isPackagePrivate && (properties.getProperty("packageScope")?.toBoolean() ?: false)) -> true
+                    (it.isPrivate && (properties.getProperty("privateScope")?.toBoolean() ?: false)) -> true
+                    else -> false
                 }
             }
             .filter { !it.isSuppressed() }
@@ -75,7 +82,7 @@ class GroovyDocJsonTool(
         output.makeOutputArea(destFolder)
         output.writeToOutput(
             destFileName,
-            classDoc.toJson(),
+            classDoc.toJson(jsonModule),
             FILE_ENCODING
         )
     }
@@ -107,9 +114,8 @@ class GroovyDocJsonTool(
         Clog.d("Generating package file $destFileName")
         output.writeToOutput(
             destFileName,
-            packageDoc.toJson(),
+            packageDoc.toJson(jsonModule),
             FILE_ENCODING
         )
     }
-
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonFormatter.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonFormatter.kt
index e2751ff..a6045df 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonFormatter.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/GroovydocJsonFormatter.kt
@@ -17,9 +17,9 @@ class GroovydocJsonFormatter(
         return dirs
             .map { dir ->
                 dir.toFile()
-                    .walkTopDown()                                               // recursively find files in the source directory
-                    .filter { it.exists() && it.isFile }                         // only get files, not directories
-                    .filter { extensions.contains(it.extension) }                // only use Groovy or Java files
+                    .walkTopDown() // recursively find files in the source directory
+                    .filter { it.exists() && it.isFile } // only get files, not directories
+                    .filter { extensions.contains(it.extension) } // only use Groovy or Java files
                     .map { it.relativeTo(dir.toFile()).invariantSeparatorsPath } // get the file's path relative to the source directory
                     .toList()
             }
@@ -52,5 +52,4 @@ class GroovydocJsonFormatter(
             it.renderToOutput(FileOutputTool(), destDir.toFile().canonicalPath)
         }
     }
-
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatClass.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatClass.kt
index 1ee1c16..9d0243d 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatClass.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatClass.kt
@@ -35,12 +35,12 @@ fun GroovyClassDoc.toClassDoc(deep: Boolean): GroovyClass {
 val GroovyClassDoc.classKind: String
     get() {
         return when {
-            isInterface                        -> "interface"
-            isAnnotationType                   -> "@interface"
-            isEnum                             -> "enum"
-            isExceptionClass()                 -> "class"
+            isInterface -> "interface"
+            isAnnotationType -> "@interface"
+            isEnum -> "enum"
+            isExceptionClass() -> "class"
             this is SimpleGroovyDoc && isTrait -> "trait"
-            else                               -> "class"
+            else -> "class"
         }
     }
 
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatHelpers.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
index 1160621..66f49d3 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
@@ -1,9 +1,9 @@
 package com.copperleaf.kodiak.groovy.formatter
 
+import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TEXT
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.DocComment
 import org.codehaus.groovy.groovydoc.GroovyClassDoc
 import org.codehaus.groovy.groovydoc.GroovyDoc
 import org.codehaus.groovy.groovydoc.GroovyParameter
@@ -57,7 +57,7 @@ class PrimitiveFieldTypeWrapper(val field: GroovyParameter) : GroovyType {
 }
 
 // Determine if class is exception class
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
 tailrec fun GroovyClassDoc.isExceptionClass(): Boolean {
     return when {
@@ -68,7 +68,7 @@ tailrec fun GroovyClassDoc.isExceptionClass(): Boolean {
 }
 
 // Process comment text
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
 data class GroovyCommentData(
     val commentText: List<RichTextComponent>,
@@ -79,11 +79,13 @@ fun String.parseCommentToValues(): GroovyCommentData {
     val commentTags = mutableMapOf<String, List<Pair<String, String>>>()
 
     val commentDoc = Jsoup.parse(this.trim())
-    commentDoc.outputSettings(Document.OutputSettings().apply {
-        indentAmount(2)
-        prettyPrint(true)
-        outline(true)
-    })
+    commentDoc.outputSettings(
+        Document.OutputSettings().apply {
+            indentAmount(2)
+            prettyPrint(true)
+            outline(true)
+        }
+    )
     commentDoc.filter(object : NodeFilter {
         override fun tail(node: Node, depth: Int): NodeFilter.FilterResult {
             return if (node is Comment) {
@@ -126,12 +128,12 @@ fun String.parseCommentToValues(): GroovyCommentData {
     var currentIndex = 0
 
     linkRegex.findAll(originalCommentText).forEach { match ->
-        val (wholeMatch, attrs, text) = match.groupValues
+        val (wholeMatch, _, text) = match.groupValues
         val aTag = Jsoup.parseBodyFragment(wholeMatch).select("a")
         val href = aTag.attr("href")
-        val title = aTag.attr("title")
+//        val title = aTag.attr("title")
 
-        if(!(href.startsWith("http://") || href.startsWith("https://"))) {
+        if (!(href.startsWith("http://") || href.startsWith("https://"))) {
             // internal link, add it as a TYPE_NAME RichTextComponent
             RichTextComponents.add(
                 RichTextComponent(
@@ -213,6 +215,6 @@ private fun String.trimLines() = this
     .map { it.trimEnd() }
     .joinToString("\n")
 
-fun GroovyClassDoc.asRichTextComponent(type: String = TYPE_NAME) : RichTextComponent {
+fun GroovyClassDoc.asRichTextComponent(type: String = TYPE_NAME): RichTextComponent {
     return RichTextComponent(type, "" + this.simpleTypeName(), "" + this.qualifiedTypeName())
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatPackage.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatPackage.kt
index 7405a4c..65783f9 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatPackage.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatPackage.kt
@@ -19,7 +19,7 @@ fun GroovyPackageDoc.toPackageDoc(deep: Boolean): GroovyPackage {
             emptyMap()
         ),
         this.packageSignature(),
-        if(deep) this.allClasses().filter { !it.isSuppressed() }.map { it.toClassDoc(false) } else emptyList(),
+        if (deep) this.allClasses().filter { !it.isSuppressed() }.map { it.toClassDoc(false) } else emptyList(),
         emptyList()
     )
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatParameters.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatParameters.kt
index afd5804..605d7d6 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatParameters.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/formatter/formatParameters.kt
@@ -63,7 +63,7 @@ fun GroovyParameter.parameterSignature(): List<RichTextComponent> {
     list.addAll(this.realType().toTypeSignature())
 
     val dimension = this.dimension()
-    if(dimension.isNotBlank()) {
+    if (dimension.isNotBlank()) {
         list.add(RichTextComponent(TEXT, dimension, ""))
     }
 
@@ -78,30 +78,27 @@ fun GroovyParameter.parameterSignature(): List<RichTextComponent> {
     return list
 }
 
-private fun GroovyParameter.dimension() : String {
+private fun GroovyParameter.dimension(): String {
     val thisTypeName: String
-    if(this is SimpleGroovyParameter) {
+    if (this is SimpleGroovyParameter) {
         val currentType = this.type()
         this.setType(null)
         thisTypeName = this.typeName()
         this.setType(currentType)
-    }
-    else {
+    } else {
         thisTypeName = ""
     }
 
-    if(thisTypeName.contains("[]")) {
+    if (thisTypeName.contains("[]")) {
         val trimmed = thisTypeName.replaceBefore('[', "")
 
-        if(this is SimpleGroovyParameter && this.vararg()) {
+        if (this is SimpleGroovyParameter && this.vararg()) {
             val vararged = trimmed.replaceAfterLast("[]", "...")
             return vararged
-        }
-        else {
+        } else {
             return trimmed
         }
-    }
-    else {
+    } else {
         return ""
     }
 }
diff --git a/groovydoc/groovydoc-formatter/src/main/kotlin/main.kt b/groovydoc/groovydoc-formatter/src/main/kotlin/main.kt
index a69d260..99acc85 100644
--- a/groovydoc/groovydoc-formatter/src/main/kotlin/main.kt
+++ b/groovydoc/groovydoc-formatter/src/main/kotlin/main.kt
@@ -1,6 +1,8 @@
 package com.copperleaf.kodiak.groovy
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
+import clog.dsl.addTagToBlacklist
+import clog.dsl.tag
 import com.eden.orchid.api.cli.Cli
 import com.eden.orchid.api.options.annotations.Option
 import groovy.lang.GroovySystem
@@ -12,7 +14,7 @@ const val FILE_ENCODING = "UTF-8"
 fun main(vararg args: String) {
     Clog.tag("Groovy version").i("{}", GroovySystem.getVersion())
 
-    Clog.getInstance().addTagToBlacklist("FlagsParser")
+    Clog.addTagToBlacklist("FlagsParser")
     val mainArgs = Cli.parseArgsInto(MainArgs(), args)
 
     GroovydocJsonFormatter(mainArgs.srcPaths, mainArgs.outputPath).execute()
@@ -37,5 +39,4 @@ class MainArgs {
     val outputPath: Path by lazy {
         File(output).toPath()
     }
-
 }
diff --git a/groovydoc/groovydoc-models/build.gradle.kts b/groovydoc/groovydoc-models/build.gradle.kts
index 9d0d56c..bb572a7 100644
--- a/groovydoc/groovydoc-models/build.gradle.kts
+++ b/groovydoc/groovydoc-models/build.gradle.kts
@@ -1,5 +1,9 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/models.gradle")
-
-dependencies {
-    "compile"(project(":common:common-models"))
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-models`
+    `copper-leaf-publish`
 }
+
+description = "Kodiak - Groovydoc Models"
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyClass.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyClass.kt
index 5a26628..9016196 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyClass.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyClass.kt
@@ -1,15 +1,16 @@
 package com.copperleaf.kodiak.groovy.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -37,21 +38,23 @@ data class GroovyClass(
     override val signature: List<RichTextComponent>,
 
     val enumItems: List<GroovyEnumConstant>
-) : DocElement, AutoDocument, TopLevel {
+) : DocElement, AutoDocument, TopLevel, JsonableDocElement {
 
-    override val parents = listOfNotNull(superclass, *interfaces.toTypedArray())
-    override val contexts = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+    override val parents: List<RichTextComponent>
+        get() = listOfNotNull(superclass, *interfaces.toTypedArray())
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::enumItems),
-        fromDocList(::fields),
-        fromDocList(::constructors),
-        fromDocList(::methods)
-    )
-
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(GroovyClass.serializer(), this)
+    override val contexts: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::enumItems),
+            fromDocList(::fields),
+            fromDocList(::constructors),
+            fromDocList(::methods)
+        )
+
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyConstructor.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyConstructor.kt
index c38c000..008a3e0 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyConstructor.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyConstructor.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.groovy.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -26,8 +27,8 @@ data class GroovyConstructor(
 ) : DocElement, AutoDocument {
     override val kind = "Constructor"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters)
+        )
 }
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyField.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyField.kt
index 27c363f..3d6839e 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyField.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyField.kt
@@ -2,9 +2,9 @@ package com.copperleaf.kodiak.groovy.models
 
 import com.copperleaf.kodiak.common.AutoDocument
 import com.copperleaf.kodiak.common.AutoDocumentNode
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
@@ -27,6 +27,6 @@ data class GroovyField(
 ) : ElementType, AutoDocument {
     override val kind = "Field"
 
-    @Transient
-    override val nodes = emptyList<AutoDocumentNode>()
+    override val nodes: List<AutoDocumentNode>
+        get() = emptyList()
 }
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyMethod.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyMethod.kt
index 9f70d8b..51f7239 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyMethod.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyMethod.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.groovy.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDoc
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
@@ -28,9 +29,9 @@ data class GroovyMethod(
 ) : DocElement, AutoDocument {
     override val kind = "Method"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters),
-        fromDoc(::returnValue)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters),
+            fromDoc(::returnValue)
+        )
 }
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyModuleDoc.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyModuleDoc.kt
index d7dfb6c..6ff1492 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyModuleDoc.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyModuleDoc.kt
@@ -1,5 +1,6 @@
 package com.copperleaf.kodiak.groovy.models
 
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.ModuleDoc
 import com.copperleaf.kodiak.common.fromDocList
@@ -12,10 +13,11 @@ class GroovyModuleDoc(
     val classes: List<GroovyClass>
 ) : ModuleDoc {
 
-    override val nodes = listOf(
-        fromDocList(::packages),
-        fromDocList(::classes)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::packages),
+            fromDocList(::classes)
+        )
 
     override fun roots(): List<DocElement> {
         return packages.filter { it.parent.isBlank() }
diff --git a/groovydoc/groovydoc-models/src/main/kotlin/GroovyPackage.kt b/groovydoc/groovydoc-models/src/main/kotlin/GroovyPackage.kt
index dc87d57..1a12f61 100644
--- a/groovydoc/groovydoc-models/src/main/kotlin/GroovyPackage.kt
+++ b/groovydoc/groovydoc-models/src/main/kotlin/GroovyPackage.kt
@@ -1,15 +1,16 @@
 package com.copperleaf.kodiak.groovy.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -30,20 +31,22 @@ data class GroovyPackage(
 
     val classes: List<GroovyClass>,
     val subpackages: List<GroovyPackage>
-) : DocElement, AutoDocument, TopLevel {
+) : DocElement, AutoDocument, TopLevel, JsonableDocElement {
     override val kind = "Package"
 
-    override val parents = listOf(RichTextComponent(TYPE_NAME, parent, parent))
-    override val contexts = emptyList<RichTextComponent>()
+    override val parents: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, parent, parent))
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::classes),
-        fromDocList(::subpackages)
-    )
-
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(serializer(), this)
+    override val contexts: List<RichTextComponent>
+        get() = emptyList()
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::classes),
+            fromDocList(::subpackages)
+        )
+
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/groovydoc/groovydoc-runner/build.gradle.kts b/groovydoc/groovydoc-runner/build.gradle.kts
index fef4e24..be1f281 100644
--- a/groovydoc/groovydoc-runner/build.gradle.kts
+++ b/groovydoc/groovydoc-runner/build.gradle.kts
@@ -1,18 +1,24 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/runners.gradle")
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-runners`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Groovydoc Runner"
 
 dependencies {
-    "compile"(project(":common:common-runner"))
-    "compile"(project(":groovydoc:groovydoc-models"))
+    api(project(":common:common-runner"))
+    api(project(":groovydoc:groovydoc-models"))
 }
 
 // wait to build this project until after the formatter is built, because we want to bundle the formatter as a resource
 // in this project
 val formatterProject = project(":groovydoc:groovydoc-formatter")
+val formatterProjectShadowJar by formatterProject.tasks.named("shadowJar")
 
-val thisProjectAssemble = tasks.getByName("assemble")
-val formatterProjectAssemble = formatterProject.tasks.getByName("assemble")
-thisProjectAssemble.dependsOn(formatterProjectAssemble)
-
-(tasks.getByName("processResources") as ProcessResources).apply {
+tasks.withType<ProcessResources> {
+    dependsOn(formatterProjectShadowJar)
     from("${formatterProject.buildDir}/libs/groovydoc-formatter-$version-all.zip")
 }
diff --git a/groovydoc/groovydoc-runner/src/main/kotlin/lib.kt b/groovydoc/groovydoc-runner/src/main/kotlin/GroovydocInvokerImpl.kt
similarity index 75%
rename from groovydoc/groovydoc-runner/src/main/kotlin/lib.kt
rename to groovydoc/groovydoc-runner/src/main/kotlin/GroovydocInvokerImpl.kt
index a927123..3bda8da 100644
--- a/groovydoc/groovydoc-runner/src/main/kotlin/lib.kt
+++ b/groovydoc/groovydoc-runner/src/main/kotlin/GroovydocInvokerImpl.kt
@@ -31,12 +31,13 @@ class GroovydocInvokerImpl(
         return arrayOf(
             "java",
             "-Xms$startMemory", "-Xmx$maxMemory",
-            "-classpath", formatterJar.toFile().absolutePath,    // classpath of embedded formatter jar
-            "com.copperleaf.kodiak.groovy.MainKt",              // Groovydoc Formatter main class
-            "--src", sourceDirs.map { it.toFile().absolutePath }
-                .joinToString(separator = File.pathSeparator),   // the sources to process
-            "--output", destinationDir.toFile().absolutePath,    // where Orchid will find them later
-            *args.toTypedArray()                                 // allow additional arbitrary args
+            "-classpath", formatterJar.toFile().absolutePath, // classpath of embedded formatter jar
+            "com.copperleaf.kodiak.groovy.MainKt", // Groovydoc Formatter main class
+            "--src",
+            sourceDirs.map { it.toFile().absolutePath }
+                .joinToString(separator = File.pathSeparator), // the sources to process
+            "--output", destinationDir.toFile().absolutePath, // where Orchid will find them later
+            *args.toTypedArray() // allow additional arbitrary args
         )
     }
 
@@ -46,5 +47,4 @@ class GroovydocInvokerImpl(
             getDocsInSubdirectory(destinationDir, "Class", GroovyClass.serializer())
         )
     }
-
 }
diff --git a/groovydoc/groovydoc-runner/src/test/kotlin/com/copperleaf/groovydoc/json/GroovydocJsonRunnerTest.kt b/groovydoc/groovydoc-runner/src/test/kotlin/com/copperleaf/groovydoc/json/GroovydocJsonRunnerTest.kt
index d84e5d6..f1e03f9 100644
--- a/groovydoc/groovydoc-runner/src/test/kotlin/com/copperleaf/groovydoc/json/GroovydocJsonRunnerTest.kt
+++ b/groovydoc/groovydoc-runner/src/test/kotlin/com/copperleaf/groovydoc/json/GroovydocJsonRunnerTest.kt
@@ -3,15 +3,14 @@ package com.copperleaf.kodiak.groovy
 import com.copperleaf.kodiak.common.DocInvoker
 import com.copperleaf.kodiak.groovy.models.GroovyModuleDoc
 import com.eden.common.util.IOStreamUtils
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.assertions.isNotEmpty
-import strikt.assertions.isNotNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 class GroovydocJsonRunnerTest {
 
@@ -39,16 +38,15 @@ class GroovydocJsonRunnerTest {
     }
 
     private fun cleanupProjectDirs() {
-
     }
 
-    @BeforeEach
+    @Before
     internal fun setUp() {
         if (useTempDirs) initTempDirs() else initProjectDirs()
         groovydocRunner = GroovydocInvokerImpl(cacheDir)
     }
 
-    @AfterEach
+    @After
     internal fun tearDown() {
         if (useTempDirs) cleanupTempDirs() else cleanupProjectDirs()
     }
@@ -63,10 +61,8 @@ class GroovydocJsonRunnerTest {
             outputDir
         ) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
 
-        expectThat(rootDoc)
-            .isNotNull()
-            .and { get { packages }.isNotEmpty() }
-            .and { get { classes }.isNotEmpty() }
+        assertNotNull(rootDoc)
+        assertTrue(rootDoc.packages.isNotEmpty())
+        assertTrue(rootDoc.classes.isNotEmpty())
     }
-
 }
diff --git a/javadoc/README.md b/javadoc/README.md
deleted file mode 100644
index 87f5db2..0000000
--- a/javadoc/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
----
-
-# Javadoc
-
-Uses a Javadoc doclet to produce a JSON format that Orchid can use to generate a documentation site.
-
-## Usage
-
-```kotlin
-// build.gradle.kts
-repositories {
-    jcenter()
-}
-dependencies {
-    compile 'com.eden.kodiak:javadoc-runner:{{ site.version }}'
-}
-```
-
-```kotlin
-var cacheDir: Path = Files.createTempDirectory("javadocCache")
-val runner: JavadocInvoker = JavadocInvokerImpl(cacheDir)
-
-val outputDir = File("build/javadoc").canonicalFile.toPath()
-outputDir.toFile().deleteRecursively()
-outputDir.toFile().mkdirs()
-
-val rootDoc = runner.getRootDoc(
-    listOf(
-        File("src/main/java").canonicalFile.toPath()
-    ),
-    outputDir
-) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
-
-rootDoc.packages.forEach { processPackage(it) }
-rootDoc.classes.forEach { processClass(it) }
-```
-
-- skip by including `@suppress` in its comments
-    - classes
-    - constructors
-    - fields
-    - methods
-
-## References
-
-- [Javadoc](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html)
diff --git a/javadoc/javadoc-formatter/build.gradle b/javadoc/javadoc-formatter/build.gradle
deleted file mode 100644
index 9debdf5..0000000
--- a/javadoc/javadoc-formatter/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-apply from: "${rootProject.rootDir}/gradle/groups/formatters.gradle"
-apply from: "${rootProject.rootDir}/gradle/actions/shadow.gradle"
-
-dependencies {
-    compile project(":common:common-formatter")
-    compile project(":javadoc:javadoc-models")
-
-    def tj = org.gradle.internal.jvm.Jvm.current().toolsJar
-    if(tj != null) {
-        shadow files(org.gradle.internal.jvm.Jvm.current().toolsJar)
-    }
-}
diff --git a/javadoc/javadoc-formatter/build.gradle.kts b/javadoc/javadoc-formatter/build.gradle.kts
new file mode 100644
index 0000000..af6657f
--- /dev/null
+++ b/javadoc/javadoc-formatter/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-formatters`
+    `copper-leaf-publish`
+    `copper-leaf-shadow`
+}
+
+description = "Kodiak - Javadoc Formatter"
+
+dependencies {
+    api(project(":javadoc:javadoc-models"))
+
+    val toolsJar = org.gradle.internal.jvm.Jvm.current().toolsJar
+    if (toolsJar != null) {
+        implementation(files(toolsJar))
+        shadow(files(toolsJar))
+    }
+}
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/JavadocJsonDoclet.kt b/javadoc/javadoc-formatter/src/main/kotlin/JavadocJsonDoclet.kt
index b75a020..9496e0c 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/JavadocJsonDoclet.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/JavadocJsonDoclet.kt
@@ -1,6 +1,6 @@
 package com.copperleaf.kodiak.java
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.connectAllToParents
 import com.copperleaf.kodiak.java.formatter.isSuppressed
 import com.copperleaf.kodiak.java.formatter.toClassDoc
@@ -10,6 +10,7 @@ import com.sun.javadoc.LanguageVersion
 import com.sun.javadoc.PackageDoc
 import com.sun.javadoc.RootDoc
 import com.sun.tools.doclets.standard.Standard
+import kotlinx.serialization.json.Json
 import java.io.File
 
 class JavadocJsonDoclet {
@@ -35,12 +36,17 @@ class JavadocJsonDoclet {
             return Standard.optionLength(optionFlag)
         }
 
-
 // Entry points, main routines
-//----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------------------
 
         @JvmStatic
         fun start(rootDoc: RootDoc): Boolean {
+            val jsonModule = Json {
+                isLenient = true
+                prettyPrint = true
+                ignoreUnknownKeys = true
+            }
+
             var destinationDir = rootDoc.options().find { it.firstOrNull() == "-d" }!![1]
             if (destinationDir.endsWith("/")) {
                 destinationDir = destinationDir.dropLast(1)
@@ -63,7 +69,7 @@ class JavadocJsonDoclet {
                     file.parentFile.mkdirs()
                 }
                 try {
-                    file.writeText(classdoc.toClassDoc(true).toJson())
+                    file.writeText(classdoc.toClassDoc(true).toJson(jsonModule))
                 } catch (e: Exception) {
                     Clog.e("Failed to create json for classdoc [${classdoc.name()}]: ${e.message}")
                 }
@@ -93,7 +99,7 @@ class JavadocJsonDoclet {
                 if (!file.parentFile.exists()) {
                     file.parentFile.mkdirs()
                 }
-                file.writeText(it.toJson())
+                file.writeText(it.toJson(jsonModule))
             }
 
             return true
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatClass.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatClass.kt
index 52a111c..260c96b 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatClass.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatClass.kt
@@ -28,7 +28,7 @@ fun ClassDoc.toClassDoc(deep: Boolean): JavaClass {
             modifiers
         ),
 
-        if(deep && this.isEnum) this.enumConstants().map { it.toEnumConstant() } else emptyList()
+        if (deep && this.isEnum) this.enumConstants().map { it.toEnumConstant() } else emptyList()
     )
 }
 
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatContent.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatContent.kt
index 1ab2cc1..29908e2 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatContent.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatContent.kt
@@ -1,2 +1 @@
 package com.copperleaf.kodiak.java.formatter
-
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatEnumConstant.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatEnumConstant.kt
index 1ef0319..f2d391b 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatEnumConstant.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatEnumConstant.kt
@@ -17,7 +17,7 @@ fun FieldDoc.toEnumConstant(): JavaEnumConstant {
     )
 }
 
-fun FieldDoc.enumConstantSignature() : List<RichTextComponent> {
+fun FieldDoc.enumConstantSignature(): List<RichTextComponent> {
     return listOf(
         RichTextComponent(TEXT, this.name())
     )
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatHelpers.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
index 1677aa9..c7b034b 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
@@ -104,6 +104,6 @@ fun RichTextComponent.expandUnparsedInlineTags(): List<RichTextComponent> {
     }
 }
 
-fun ClassDoc.asRichTextComponent(type: String = TYPE_NAME) : RichTextComponent {
+fun ClassDoc.asRichTextComponent(type: String = TYPE_NAME): RichTextComponent {
     return RichTextComponent(type, this.typeName(), this.qualifiedTypeName())
 }
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatPackage.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatPackage.kt
index 011635b..09bbe55 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatPackage.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatPackage.kt
@@ -15,7 +15,7 @@ fun PackageDoc.toPackageDoc(deep: Boolean): JavaPackage {
         emptyList(),
         this.getComment(),
         this.packageSignature(),
-        if(deep) this.allClasses().filter { !it.isSuppressed() }.map { it.toClassDoc(false) } else emptyList(),
+        if (deep) this.allClasses().filter { !it.isSuppressed() }.map { it.toClassDoc(false) } else emptyList(),
         emptyList() // this will be populated later via .copy()
     )
 }
diff --git a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatParameters.kt b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatParameters.kt
index c045619..25b23c6 100644
--- a/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatParameters.kt
+++ b/javadoc/javadoc-formatter/src/main/kotlin/formatter/formatParameters.kt
@@ -15,7 +15,7 @@ fun formatParameters(
     tags: Array<ParamTag>,
     lastParamIsVarArgs: Boolean
 ): List<JavaParameter> {
-    val paramWithVararg = if(lastParamIsVarArgs) params.lastOrNull { it.type().dimension().isNotBlank() } else null
+    val paramWithVararg = if (lastParamIsVarArgs) params.lastOrNull { it.type().dimension().isNotBlank() } else null
 
     return params.map { param ->
         param.toParameter(
@@ -120,7 +120,6 @@ fun Parameter.parameterSignature(isVarArg: Boolean): List<RichTextComponent> {
         )
     )
 
-
     return list
 }
 
diff --git a/javadoc/javadoc-models/build.gradle.kts b/javadoc/javadoc-models/build.gradle.kts
index 9d0d56c..f11d76b 100644
--- a/javadoc/javadoc-models/build.gradle.kts
+++ b/javadoc/javadoc-models/build.gradle.kts
@@ -1,5 +1,9 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/models.gradle")
-
-dependencies {
-    "compile"(project(":common:common-models"))
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-models`
+    `copper-leaf-publish`
 }
+
+description = "Kodiak - Javadoc Models"
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaClass.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaClass.kt
similarity index 63%
rename from javadoc/javadoc-models/src/main/kotlin/JavaClass.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaClass.kt
index 51c0ec5..b878ca7 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaClass.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaClass.kt
@@ -1,16 +1,16 @@
 package com.copperleaf.kodiak.java.models
 
 import com.copperleaf.kodiak.common.AutoDocument
+import com.copperleaf.kodiak.common.AutoDocumentNode
+import com.copperleaf.kodiak.common.DocComment
+import com.copperleaf.kodiak.common.JsonableDocElement
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.DocComment
-import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.SpecializedDocElement
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -38,23 +38,25 @@ data class JavaClass(
     override val signature: List<RichTextComponent>,
 
     val enumItems: List<JavaEnumConstant>
-) : DocElement, AutoDocument, SpecializedDocElement, TopLevel {
+) : JsonableDocElement, AutoDocument, SpecializedDocElement, TopLevel {
 
     override val kind = "Class"
 
-    override val parents = listOfNotNull(superclass, *interfaces.toTypedArray())
-    override val contexts = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+    override val parents: List<RichTextComponent>
+        get() = listOfNotNull(superclass, *interfaces.toTypedArray())
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::enumItems),
-        fromDocList(::fields),
-        fromDocList(::constructors),
-        fromDocList(::methods)
-    )
-
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(serializer(), this)
+    override val contexts: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, `package`, `package`))
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::enumItems),
+            fromDocList(::fields),
+            fromDocList(::constructors),
+            fromDocList(::methods)
+        )
+
+    override fun toJson(json: Json): String {
+        return json.encodeToString(JavaClass.serializer(), this)
     }
 }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaConstructor.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaConstructor.kt
similarity index 82%
rename from javadoc/javadoc-models/src/main/kotlin/JavaConstructor.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaConstructor.kt
index 1077750..4816245 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaConstructor.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaConstructor.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.java.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -26,8 +27,8 @@ data class JavaConstructor(
 ) : DocElement, AutoDocument {
     override val kind = "Constructor"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters)
+        )
 }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaEnumConstant.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaEnumConstant.kt
similarity index 100%
rename from javadoc/javadoc-models/src/main/kotlin/JavaEnumConstant.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaEnumConstant.kt
index 948f727..13e4c4c 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaEnumConstant.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaEnumConstant.kt
@@ -1,8 +1,8 @@
 package com.copperleaf.kodiak.java.models
 
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaField.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaField.kt
similarity index 91%
rename from javadoc/javadoc-models/src/main/kotlin/JavaField.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaField.kt
index 0216901..1facd48 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaField.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaField.kt
@@ -2,9 +2,9 @@ package com.copperleaf.kodiak.java.models
 
 import com.copperleaf.kodiak.common.AutoDocument
 import com.copperleaf.kodiak.common.AutoDocumentNode
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
@@ -27,6 +27,6 @@ data class JavaField(
 ) : ElementType, AutoDocument {
     override val kind = "Field"
 
-    @Transient
-    override val nodes = emptyList<AutoDocumentNode>()
+    override val nodes: List<AutoDocumentNode>
+        get() = emptyList()
 }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaMethod.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaMethod.kt
similarity index 81%
rename from javadoc/javadoc-models/src/main/kotlin/JavaMethod.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaMethod.kt
index d7ed767..543ebf5 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaMethod.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaMethod.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.java.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDoc
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
@@ -28,9 +29,9 @@ data class JavaMethod(
 ) : DocElement, AutoDocument {
     override val kind = "Method"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters),
-        fromDoc(::returnValue)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters),
+            fromDoc(::returnValue)
+        )
 }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaModuleDoc.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaModuleDoc.kt
similarity index 70%
rename from javadoc/javadoc-models/src/main/kotlin/JavaModuleDoc.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaModuleDoc.kt
index ed158ff..2b6cc29 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaModuleDoc.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaModuleDoc.kt
@@ -1,5 +1,6 @@
 package com.copperleaf.kodiak.java.models
 
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.ModuleDoc
 import com.copperleaf.kodiak.common.fromDocList
@@ -12,10 +13,11 @@ class JavaModuleDoc(
     val classes: List<JavaClass>
 ) : ModuleDoc {
 
-    override val nodes = listOf(
-        fromDocList(::packages),
-        fromDocList(::classes)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::packages),
+            fromDocList(::classes)
+        )
 
     override fun roots(): List<DocElement> {
         return packages.filter { it.parent.isBlank() }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaPackage.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaPackage.kt
similarity index 63%
rename from javadoc/javadoc-models/src/main/kotlin/JavaPackage.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaPackage.kt
index fcc1811..286f964 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaPackage.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaPackage.kt
@@ -1,15 +1,15 @@
 package com.copperleaf.kodiak.java.models
 
 import com.copperleaf.kodiak.common.AutoDocument
+import com.copperleaf.kodiak.common.AutoDocumentNode
+import com.copperleaf.kodiak.common.DocComment
+import com.copperleaf.kodiak.common.JsonableDocElement
 import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
-import com.copperleaf.kodiak.common.DocComment
-import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -29,20 +29,22 @@ data class JavaPackage(
     override val signature: List<RichTextComponent>,
     val classes: List<JavaClass>,
     val subpackages: List<JavaPackage>
-) : DocElement, AutoDocument, TopLevel {
+) : JsonableDocElement, AutoDocument, TopLevel {
     override val kind = "Package"
 
-    override val parents = listOf(RichTextComponent(TYPE_NAME, parent, parent))
-    override val contexts = emptyList<RichTextComponent>()
+    override val parents: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, parent, parent))
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::classes),
-        fromDocList(::subpackages)
-    )
+    override val contexts: List<RichTextComponent>
+        get() = emptyList<RichTextComponent>()
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf<AutoDocumentNode>(
+            fromDocList(::classes),
+            fromDocList(::subpackages)
+        )
 
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(serializer(), this)
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaParameter.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaParameter.kt
similarity index 100%
rename from javadoc/javadoc-models/src/main/kotlin/JavaParameter.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaParameter.kt
index ac1cfb3..5f062e1 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaParameter.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaParameter.kt
@@ -1,8 +1,8 @@
 package com.copperleaf.kodiak.java.models
 
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
diff --git a/javadoc/javadoc-models/src/main/kotlin/JavaReturnType.kt b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaReturnType.kt
similarity index 100%
rename from javadoc/javadoc-models/src/main/kotlin/JavaReturnType.kt
rename to javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaReturnType.kt
index 3265e72..1174e0e 100644
--- a/javadoc/javadoc-models/src/main/kotlin/JavaReturnType.kt
+++ b/javadoc/javadoc-models/src/main/kotlin/com/copperleaf/kodiak/java/models/JavaReturnType.kt
@@ -1,8 +1,8 @@
 package com.copperleaf.kodiak.java.models
 
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
diff --git a/javadoc/javadoc-runner/build.gradle.kts b/javadoc/javadoc-runner/build.gradle.kts
index fcddf8f..c64979e 100644
--- a/javadoc/javadoc-runner/build.gradle.kts
+++ b/javadoc/javadoc-runner/build.gradle.kts
@@ -1,22 +1,29 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/runners.gradle")
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-runners`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Javadoc Runner"
 
 dependencies {
-    "compile"(project(":common:common-runner"))
-    "compile"(project(":javadoc:javadoc-models"))
+    api(project(":common:common-runner"))
+    api(project(":javadoc:javadoc-models"))
 }
 
 // wait to build this project until after the formatter is built, because we want to bundle the formatter as a resource
 // in this project
 val formatterProject = project(":javadoc:javadoc-formatter")
-val thisProjectAssemble = tasks.getByName("assemble")
-val formatterProjectAssemble = formatterProject.tasks.getByName("assemble")
-thisProjectAssemble.dependsOn(formatterProjectAssemble)
+val formatterProjectShadowJar by formatterProject.tasks.named("shadowJar")
 
-(tasks.getByName("processResources") as ProcessResources).apply {
+tasks.withType<ProcessResources> {
+    dependsOn(formatterProjectShadowJar)
     from("${formatterProject.buildDir}/libs/javadoc-formatter-$version-all.zip")
 }
 
-(tasks.getByName("javadoc") as Javadoc).apply {
+tasks.withType<Javadoc> {
     source = fileTree("$projectDir/src/example/java")
     setDestinationDir(file("$buildDir/javadoc/example"))
 }
diff --git a/javadoc/javadoc-runner/src/main/kotlin/lib.kt b/javadoc/javadoc-runner/src/main/kotlin/JavadocInvokerImpl.kt
similarity index 75%
rename from javadoc/javadoc-runner/src/main/kotlin/lib.kt
rename to javadoc/javadoc-runner/src/main/kotlin/JavadocInvokerImpl.kt
index 697904d..452fac2 100644
--- a/javadoc/javadoc-runner/src/main/kotlin/lib.kt
+++ b/javadoc/javadoc-runner/src/main/kotlin/JavadocInvokerImpl.kt
@@ -7,15 +7,15 @@ import com.copperleaf.kodiak.common.modules.impl.modulelocator.GradleModuleLocat
 import com.copperleaf.kodiak.common.modules.impl.modulelocator.MavenModuleLocator
 import com.copperleaf.kodiak.common.version
 import com.copperleaf.kodiak.java.models.JavaClass
-import com.copperleaf.kodiak.java.models.JavaPackage
 import com.copperleaf.kodiak.java.models.JavaModuleDoc
+import com.copperleaf.kodiak.java.models.JavaPackage
 import java.nio.file.Files
 import java.nio.file.Path
 
 class JavadocInvokerImpl(
-        cacheDir: Path = Files.createTempDirectory("javadoc-runner"),
-        private val startMemory: String = "256m",
-        private val maxMemory: String = "1024m"
+    cacheDir: Path = Files.createTempDirectory("javadoc-runner"),
+    private val startMemory: String = "256m",
+    private val maxMemory: String = "1024m"
 ) : BaseDocInvoker<JavaModuleDoc>(cacheDir) {
     override val formatterJarName = "javadoc-formatter-$version-all"
 
@@ -38,11 +38,11 @@ class JavadocInvokerImpl(
         return arrayOf(
             "javadoc",
             "-J-Xms$startMemory", "-J-Xmx$maxMemory",
-            "-d", destinationDir.toFile().absolutePath,                 // where Orchid will find them later
+            "-d", destinationDir.toFile().absolutePath, // where Orchid will find them later
             "-doclet", "com.copperleaf.kodiak.java.JavadocJsonDoclet",
-            "-docletpath", formatterJar.toFile().absolutePath,          // classpath of embedded formatter jar
-            *args.toTypedArray(),                                       // allow additional arbitrary args
-            *allFiles.toTypedArray()                                    // the sources to process
+            "-docletpath", formatterJar.toFile().absolutePath, // classpath of embedded formatter jar
+            *args.toTypedArray(), // allow additional arbitrary args
+            *allFiles.toTypedArray() // the sources to process
         )
     }
 
@@ -52,5 +52,4 @@ class JavadocInvokerImpl(
             getDocsInSubdirectory(destinationDir, "Class", JavaClass.serializer())
         )
     }
-
 }
diff --git a/javadoc/javadoc-runner/src/test/kotlin/JavadocJsonRunnerTest.kt b/javadoc/javadoc-runner/src/test/kotlin/JavadocJsonRunnerTest.kt
index 3ff29bb..3b4dcea 100644
--- a/javadoc/javadoc-runner/src/test/kotlin/JavadocJsonRunnerTest.kt
+++ b/javadoc/javadoc-runner/src/test/kotlin/JavadocJsonRunnerTest.kt
@@ -1,17 +1,16 @@
 package com.copperleaf.kodiak.java
 
-import com.copperleaf.kodiak.java.models.JavaModuleDoc
 import com.copperleaf.kodiak.common.DocInvoker
+import com.copperleaf.kodiak.java.models.JavaModuleDoc
 import com.eden.common.util.IOStreamUtils
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.assertions.isNotEmpty
-import strikt.assertions.isNotNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 class JavadocJsonRunnerTest {
 
@@ -39,16 +38,15 @@ class JavadocJsonRunnerTest {
     }
 
     private fun cleanupProjectDirs() {
-
     }
 
-    @BeforeEach
+    @Before
     internal fun setUp() {
         if (useTempDirs) initTempDirs() else initProjectDirs()
         javadocRunner = JavadocInvokerImpl(cacheDir)
     }
 
-    @AfterEach
+    @After
     internal fun tearDown() {
         if (useTempDirs) cleanupTempDirs() else cleanupProjectDirs()
     }
@@ -60,10 +58,8 @@ class JavadocJsonRunnerTest {
             outputDir
         ) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
 
-        expectThat(rootDoc)
-            .isNotNull()
-            .and { get { packages }.isNotEmpty() }
-            .and { get { classes }.isNotEmpty() }
+        assertNotNull(rootDoc)
+        assertTrue(rootDoc.packages.isNotEmpty())
+        assertTrue(rootDoc.classes.isNotEmpty())
     }
-
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b96cf1e..b4e39e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,20 @@
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            when (requested.id.id) {
+                "binary-compatibility-validator" -> useModule("org.jetbrains.kotlinx:binary-compatibility-validator:${requested.version}")
+            }
+        }
+    }
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+        maven(url = "https://kotlin.bintray.com/kotlinx")
+    }
+}
+
 rootProject.name = "kodiak"
 
 include(":docs")
diff --git a/swiftdoc/README.md b/swiftdoc/README.md
deleted file mode 100644
index a5cabf9..0000000
--- a/swiftdoc/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
----
-
-# Swiftdoc
-
-Uses a Sourcekitten formatter to produce a JSON format that Orchid can use to generate a documentation site.
-
-## Usage
-
-```kotlin
-// build.gradle.kts
-repositories {
-    jcenter()
-}
-dependencies {
-    compile 'com.eden.kodiak:swiftdoc-runner:{{ site.version }}'
-}
-```
-
-```kotlin
-var cacheDir: Path = Files.createTempDirectory("swiftdocCache")
-val runner: SwiftdocInvoker = SwiftdocInvokerImpl(cacheDir)
-
-val outputDir = File("build/swiftdoc").canonicalFile.toPath()
-outputDir.toFile().deleteRecursively()
-outputDir.toFile().mkdirs()
-
-val rootDoc = runner.getRootDoc(
-    listOf(
-        File("src/main/swift").canonicalFile.toPath()
-    ),
-    outputDir
-) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
-
-rootDoc.sourceFiles.forEach { processSourceFile(it) }
-rootDoc.classes.forEach { processClass(it) }
-```
-
-- skip by including `- suppress` in its comments
-    - classes
-    - initializers
-    - fields
-    - methods
-
-## References
-
-- [SourceKitten](https://github.com/jpsim/SourceKitten)
diff --git a/swiftdoc/swiftdoc-formatter/build.gradle.kts b/swiftdoc/swiftdoc-formatter/build.gradle.kts
index 756c442..a5db99e 100644
--- a/swiftdoc/swiftdoc-formatter/build.gradle.kts
+++ b/swiftdoc/swiftdoc-formatter/build.gradle.kts
@@ -1,26 +1,30 @@
 plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-formatters`
+    `copper-leaf-publish`
+    `copper-leaf-shadow`
     id("de.undercouch.download")
 }
 
-apply(from = "${rootProject.rootDir}/gradle/groups/formatters.gradle")
-apply(from = "${rootProject.rootDir}/gradle/actions/shadow.gradle")
+description = "Kodiak - Swiftdoc Formatter"
 
 dependencies {
-    "compile"(project(":common:common-formatter"))
-    "compile"(project(":swiftdoc:swiftdoc-models"))
+    api(project(":swiftdoc:swiftdoc-models"))
 }
 
-val updateSourceKitten by tasks.registering() {
+val updateSourceKitten by tasks.registering {
     doLast {
         val version = project.property("sourceKittenVersion")
-        val tarFile = file("${project.buildDir}/sourcekitten/sourcekitten-${version}.mojave.bottle.tar.gz")
+        val tarFile = file("${project.buildDir}/sourcekitten/sourcekitten-$version.mojave.bottle.tar.gz")
         val tarFileUnpacked = file("${project.buildDir}/sourcekitten/unpacked")
-        val unpackedBinary = file("${project.buildDir}/sourcekitten/unpacked/sourcekitten/${version}/bin/sourcekitten")
+        val unpackedBinary = file("${project.buildDir}/sourcekitten/unpacked/sourcekitten/$version/bin/sourcekitten")
         val destinationBinaryFolder = file("${project.projectDir}/src/main/resources/bin")
 
         download.configure(
             delegateClosureOf<de.undercouch.gradle.tasks.download.DownloadAction> {
-                src("https://homebrew.bintray.com/bottles/sourcekitten-${version}.mojave.bottle.tar.gz")
+                src("https://homebrew.bintray.com/bottles/sourcekitten-$version.mojave.bottle.tar.gz")
                 dest(tarFile)
                 overwrite(true)
             }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SourcekittenWrapper.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SourcekittenWrapper.kt
index 3964f84..ef875f8 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SourcekittenWrapper.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SourcekittenWrapper.kt
@@ -1,6 +1,6 @@
 package com.copperleaf.kodiak.swift
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.eden.common.util.IOStreamUtils
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
@@ -39,7 +39,7 @@ class SourcekittenWrapper(
     /**
      * Execute a SourceKitten command in a child process, and return the stdout content as a String
      */
-    fun proc(vararg processArgs: String) : String {
+    fun proc(vararg processArgs: String): String {
         val builder = ProcessBuilder()
             .directory(mainArgs.sourceKittenBinary.parent.toFile())
             .command("./sourcekitten", *processArgs)
@@ -64,5 +64,4 @@ class SourcekittenWrapper(
     override fun close() {
         executor.shutdown()
     }
-
 }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocFileParser.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocFileParser.kt
index ed00ab6..940361c 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocFileParser.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocFileParser.kt
@@ -1,16 +1,18 @@
 package com.copperleaf.kodiak.swift
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.swift.internal.models.SourceKittenParseResult
 import com.copperleaf.kodiak.swift.internal.models.SourceKittenSubstructure
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.nio.file.Path
 
 class SwiftdocFileParser(
     val mainArgs: MainArgs,
     val sourceKittenWrapper: SourcekittenWrapper,
-    val remapper: SwiftdocRemapper
+    val remapper: SwiftdocRemapper,
+    val jsonModule: Json,
 ) {
 
     fun processAll() {
@@ -39,18 +41,18 @@ class SwiftdocFileParser(
 
         singleFile.writeText(doc)
 
-        val sourceKittenDocs = SourceKittenParseResult.fromJson(doc)
+        val sourceKittenDocs = SourceKittenParseResult.fromJson(jsonModule, doc)
 
         sourceKittenDocs.files.forEach { (key, value) ->
             Clog.v("Processing $relativeFile.swift")
             val structure = sourceKittenWrapper.proc("structure", "--file", file.absolutePath)
-            val structureDoc = SourceKittenSubstructure.fromJson(structure)
+            val structureDoc = SourceKittenSubstructure.fromJson(jsonModule, structure)
 
             value.sourceFile = relativeFile
             structureDoc.sourceFile = relativeFile
 
             structureFile.writeText(structure)
-            remapper.processSourceKittenModel(dir, key, value, structureDoc)
+            remapper.processSourceKittenModel(dir, key, value, structureDoc, jsonModule)
         }
 
         return null
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocRemapper.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocRemapper.kt
index 8eb258c..6604981 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocRemapper.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/SwiftdocRemapper.kt
@@ -1,6 +1,6 @@
 package com.copperleaf.kodiak.swift
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.JsonableDocElement
 import com.copperleaf.kodiak.common.SpecializedDocElement
@@ -8,6 +8,7 @@ import com.copperleaf.kodiak.swift.formatter.isSuppressed
 import com.copperleaf.kodiak.swift.formatter.toSourceFile
 import com.copperleaf.kodiak.swift.internal.models.SourceKittenFile
 import com.copperleaf.kodiak.swift.internal.models.SourceKittenSubstructure
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.nio.file.Path
 
@@ -19,18 +20,18 @@ class SwiftdocRemapper(
         dir: Path,
         sourceFileName: String,
         model: SourceKittenFile,
-        structure: SourceKittenSubstructure
-    ) : Map<Class<DocElement>, List<DocElement>> {
+        structure: SourceKittenSubstructure,
+        jsonModule: Json
+    ): Map<Class<DocElement>, List<DocElement>> {
         // create child pages for the elements contained within this source file
         val sourceFileStructures = model.substructures.map {
             val matchingStructure = it.findMatch(structure)
-            if(matchingStructure != null && !it.isSuppressed(mainArgs)) {
-                processSourceKittenModel(dir, sourceFileName, it to matchingStructure)
-            }
-            else null
+            if (matchingStructure != null && !it.isSuppressed(mainArgs)) {
+                processSourceKittenModel(dir, sourceFileName, it to matchingStructure, jsonModule)
+            } else null
         }
-        .filterNotNull()
-        .groupBy { it.javaClass }
+            .filterNotNull()
+            .groupBy { it.javaClass }
 
         // create the sourceFile doc and write it to disk
         val relativeFilePath = File(sourceFileName)
@@ -42,7 +43,7 @@ class SwiftdocRemapper(
         val file = newFile("${mainArgs.output}/SourceFile/$relativeFilePath/index.json")
 
         model.sourceFile = "$relativeFilePath.swift"
-        file.writeText(model.toSourceFile(sourceFileStructures).toJson())
+        file.writeText(model.toSourceFile(sourceFileStructures).toJson(jsonModule))
 
         return sourceFileStructures
     }
@@ -50,7 +51,8 @@ class SwiftdocRemapper(
     private fun processSourceKittenModel(
         dir: Path,
         sourceFileName: String,
-        model: Pair<SourceKittenSubstructure, SourceKittenSubstructure>
+        model: Pair<SourceKittenSubstructure, SourceKittenSubstructure>,
+        jsonModule: Json
     ): DocElement? {
         val relativeFilePath = File(sourceFileName)
             .relativeTo(dir.toFile())
@@ -60,14 +62,17 @@ class SwiftdocRemapper(
 
         val docModel = model.first.format(mainArgs, model.second)
 
-        if(docModel != null && docModel is JsonableDocElement) {
-            val baseDir = if(docModel is SpecializedDocElement) "${docModel.kind}/${docModel.subKind}" else docModel.kind
+        if (docModel != null && docModel is JsonableDocElement) {
+            val baseDir = if (docModel is SpecializedDocElement) {
+                "${docModel.kind}/${docModel.subKind}"
+            } else {
+                docModel.kind
+            }
 
             val file = newFile("${mainArgs.output}/$baseDir/$relativeFilePath/${model.first.name}.json")
-            file.writeText(docModel.toJson())
-        }
-        else {
-            if(docModel?.kind !in listOf("Field", "Method", "Typealias", "Extension")) {
+            file.writeText(docModel.toJson(jsonModule))
+        } else {
+            if (docModel?.kind !in listOf("Field", "Method", "Typealias", "Extension")) {
                 Clog.v("Unknown model type: ${docModel?.name} (${docModel?.kind})")
             }
         }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatClass.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatClass.kt
index af4984c..e43dd3c 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatClass.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatClass.kt
@@ -15,7 +15,11 @@ import com.copperleaf.kodiak.swift.internal.models.SwiftSubstructureKind.STATIC_
 import com.copperleaf.kodiak.swift.internal.models.SwiftSubstructureKind.STATIC_VARIABLE
 import com.copperleaf.kodiak.swift.models.SwiftClass
 
-fun SourceKittenSubstructure.toClassDoc(mainArgs: MainArgs, structure: SourceKittenSubstructure, deep: Boolean = false): SwiftClass {
+fun SourceKittenSubstructure.toClassDoc(
+    mainArgs: MainArgs,
+    structure: SourceKittenSubstructure,
+    deep: Boolean = false
+): SwiftClass {
     return SwiftClass(
         this,
         sourceFile,
@@ -23,12 +27,36 @@ fun SourceKittenSubstructure.toClassDoc(mainArgs: MainArgs, structure: SourceKit
         emptyList(),
         this.kind.name,
         this.name,
-        "${sourceFile}/${this.name}",
+        "$sourceFile/${this.name}",
         this.getModifiers(),
         this.getComment(),
-        if (deep) this.childrenOfType(INIT_METHOD, extraFilter = { !it.isSuppressed(mainArgs) }) { it.toInitializerDoc(structure) } else emptyList(),
-        if (deep) this.childrenOfType(STATIC_METHOD, CLASS_METHOD, INSTANCE_METHOD, extraFilter = { !it.isSuppressed(mainArgs) }) { it.toFunctionDoc(structure) } else emptyList(),
-        if (deep) this.childrenOfType(STATIC_VARIABLE, CLASS_VARIABLE, INSTANCE_VARIABLE, extraFilter = { !it.isSuppressed(mainArgs) }) { it.toVariableDoc(structure) } else emptyList(),
+        if (deep) {
+            this
+                .childrenOfType(
+                    INIT_METHOD,
+                    extraFilter = { !it.isSuppressed(mainArgs) }
+                ) { it.toInitializerDoc(structure) }
+        } else {
+            emptyList()
+        },
+        if (deep) {
+            this
+                .childrenOfType(
+                    STATIC_METHOD, CLASS_METHOD, INSTANCE_METHOD,
+                    extraFilter = { !it.isSuppressed(mainArgs) }
+                ) { it.toFunctionDoc(structure) }
+        } else {
+            emptyList()
+        },
+        if (deep) {
+            this
+                .childrenOfType(
+                    STATIC_VARIABLE, CLASS_VARIABLE, INSTANCE_VARIABLE,
+                    extraFilter = { !it.isSuppressed(mainArgs) }
+                ) { it.toVariableDoc(structure) }
+        } else {
+            emptyList()
+        },
         classSignature()
     )
 }
@@ -43,7 +71,7 @@ fun SourceKittenSubstructure.classSignature(): List<RichTextComponent> {
     list.add(RichTextComponent(TEXT, this.kind.kindName))
     list.add(RichTextComponent(TYPE_NAME, " ${this.name}", this.name))
 
-    if(this.inheritedtypes.isNotEmpty()) {
+    if (this.inheritedtypes.isNotEmpty()) {
         list.add(RichTextComponent(PUNCTUATION, ":"))
 
         this.inheritedtypes.forEachIndexed { index, type ->
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatExtension.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatExtension.kt
index 5a33d4c..09d864a 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatExtension.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatExtension.kt
@@ -16,11 +16,17 @@ fun SourceKittenSubstructure.toExtensionDoc(mainArgs: MainArgs, structure: Sourc
         sourceFile,
         this.kind.name,
         this.name,
-        "${sourceFile}/${this.name}",
+        "$sourceFile/${this.name}",
         this.getModifiers(),
         this.getComment(),
-        this.childrenOfType(STATIC_METHOD, extraFilter = { !it.isSuppressed(mainArgs) }) { it.toFunctionDoc(structure) },
-        this.childrenOfType(STATIC_VARIABLE, extraFilter = { !it.isSuppressed(mainArgs) }) { it.toVariableDoc(structure) },
+        this.childrenOfType(
+            STATIC_METHOD,
+            extraFilter = { !it.isSuppressed(mainArgs) }
+        ) { it.toFunctionDoc(structure) },
+        this.childrenOfType(
+            STATIC_VARIABLE,
+            extraFilter = { !it.isSuppressed(mainArgs) }
+        ) { it.toVariableDoc(structure) },
         extensionSignature()
     )
 }
@@ -32,7 +38,7 @@ fun SourceKittenSubstructure.extensionSignature(): List<RichTextComponent> {
     list.add(RichTextComponent(TEXT, " ${this.kind.kindName}"))
     list.add(RichTextComponent(TYPE_NAME, " ${this.name}", this.name))
 
-    if(this.inheritedtypes.isNotEmpty()) {
+    if (this.inheritedtypes.isNotEmpty()) {
         list.add(RichTextComponent(PUNCTUATION, ":"))
 
         this.inheritedtypes.forEachIndexed { index, type ->
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatFunction.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatFunction.kt
index e8193e2..cebc525 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatFunction.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatFunction.kt
@@ -16,7 +16,9 @@ fun SourceKittenSubstructure.toFunctionDoc(structure: SourceKittenSubstructure):
 
     val methodName = this.name.split("(").first().trim()
     val modifiers = this.getModifiers()
-    val parameters = ownStructure?.childrenOfType(SwiftSubstructureKind.PARAMETER) { it.toParameterDoc() } ?: emptyList()
+    val parameters = ownStructure
+        ?.childrenOfType(SwiftSubstructureKind.PARAMETER) { it.toParameterDoc() }
+        ?: emptyList()
     val returnType = this.toReturnType()
 
     return SwiftMethod(
@@ -75,7 +77,7 @@ fun SourceKittenSubstructure.functionSignature(
     list.add(RichTextComponent(TEXT, "func"))
     list.add(RichTextComponent(TEXT, " $methodName"))
     list.addAll(parameters.toParameterListSignature())
-    if(returnType.typeId != "Void") {
+    if (returnType.typeId != "Void") {
         list.add(RichTextComponent(PUNCTUATION, " -> "))
         list.addAll(returnType.signature)
     }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatHelpers.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
index 7713069..0b50da4 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatHelpers.kt
@@ -7,7 +7,9 @@ import com.copperleaf.kodiak.swift.internal.models.SourceKittenSubstructure
 import com.copperleaf.kodiak.swift.internal.models.SwiftSubstructureKind
 
 fun SourceKittenSubstructure.isSuppressed(mainArgs: MainArgs): Boolean {
-    return !isVisible(mainArgs) || this.getComment().components.any { it.text.contains("^.*?- suppress".toRegex(RegexOption.MULTILINE)) }
+    return !isVisible(mainArgs) || this.getComment().components.any {
+        it.text.contains("^.*?- suppress".toRegex(RegexOption.MULTILINE))
+    }
 }
 
 fun SourceKittenSubstructure.isVisible(mainArgs: MainArgs): Boolean {
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatInitializer.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatInitializer.kt
index 10c28ea..5ea999a 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatInitializer.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatInitializer.kt
@@ -13,7 +13,9 @@ fun SourceKittenSubstructure.toInitializerDoc(structure: SourceKittenSubstructur
 
     val methodName = this.name.split("(").first().trim()
     val modifiers = this.getModifiers()
-    val parameters = ownStructure?.childrenOfType(SwiftSubstructureKind.PARAMETER) { it.toParameterDoc() } ?: emptyList()
+    val parameters = ownStructure
+        ?.childrenOfType(SwiftSubstructureKind.PARAMETER) { it.toParameterDoc() }
+        ?: emptyList()
 
     return SwiftConstructor(
         this,
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatSourceFile.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatSourceFile.kt
index 9b0bb59..a5ed19a 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatSourceFile.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatSourceFile.kt
@@ -44,27 +44,29 @@ fun SourceKittenFile.sourceFileSignature(): List<RichTextComponent> {
     return list
 }
 
-private inline fun <reified T : DocElement> Map<Class<DocElement>, List<DocElement>>.getAs(transform: T.()->T) : List<T> {
+private inline fun <reified T : DocElement> Map<Class<DocElement>, List<DocElement>>.getAs(
+    transform: T.() -> T
+): List<T> {
     val tt: Class<DocElement> = T::class.java as Class<DocElement>
     return this[tt]?.map { it as T }?.map { it.transform() } ?: emptyList()
 }
 
-private fun SwiftClass.liteCopy() : SwiftClass {
+private fun SwiftClass.liteCopy(): SwiftClass {
     return this.copy(constructors = emptyList(), methods = emptyList(), fields = emptyList())
 }
 
-private fun SwiftField.liteCopy() : SwiftField {
+private fun SwiftField.liteCopy(): SwiftField {
     return this.copy()
 }
 
-private fun SwiftMethod.liteCopy() : SwiftMethod {
+private fun SwiftMethod.liteCopy(): SwiftMethod {
     return this.copy()
 }
 
-private fun SwiftTypealias.liteCopy() : SwiftTypealias {
+private fun SwiftTypealias.liteCopy(): SwiftTypealias {
     return this.copy()
 }
 
-private fun SwiftExtension.liteCopy() : SwiftExtension {
+private fun SwiftExtension.liteCopy(): SwiftExtension {
     return this.copy()
 }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatTypealias.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatTypealias.kt
index eb9c8e4..baae016 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatTypealias.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/formatter/formatTypealias.kt
@@ -11,7 +11,7 @@ fun SourceKittenSubstructure.toTypealiasDoc(structure: SourceKittenSubstructure)
     return SwiftTypealias(
         this,
         this.kind.name,
-        "${sourceFile}/${this.name}",
+        "$sourceFile/${this.name}",
         this.getModifiers(),
         this.getComment(),
         typealiasSignature()
@@ -24,7 +24,7 @@ fun SourceKittenSubstructure.typealiasSignature(): List<RichTextComponent> {
     list.add(RichTextComponent(TEXT, this.kind.kindName))
     list.add(RichTextComponent(TYPE_NAME, " ${this.name}", this.name))
 
-    if(this.inheritedtypes.isNotEmpty()) {
+    if (this.inheritedtypes.isNotEmpty()) {
         list.add(RichTextComponent(PUNCTUATION, ":"))
 
         this.inheritedtypes.forEachIndexed { index, type ->
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenParseResult.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenParseResult.kt
index b475684..9992b05 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenParseResult.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenParseResult.kt
@@ -1,19 +1,17 @@
 package com.copperleaf.kodiak.swift.internal.models
 
-import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.internal.StringSerializer
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.map
 
 data class SourceKittenParseResult(
     val files: Map<String, SourceKittenFile>
 ) {
 
-    @UseExperimental(UnstableDefault::class)
     companion object {
-        fun fromJson(json: String): SourceKittenParseResult {
-            val filesSerializer = (StringSerializer to SourceKittenFile.serializer()).map
-            val files = Json.nonstrict.parse(filesSerializer, json)
+        fun fromJson(jsonModule: Json, json: String): SourceKittenParseResult {
+            val filesSerializer = MapSerializer(String.serializer(), SourceKittenFile.serializer())
+            val files = jsonModule.decodeFromString(filesSerializer, json)
             return SourceKittenParseResult(files)
         }
     }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenSubstructure.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenSubstructure.kt
index 476f063..7b1809f 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenSubstructure.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SourceKittenSubstructure.kt
@@ -61,8 +61,8 @@ data class SourceKittenSubstructure(
     }
 
     companion object {
-        fun fromJson(json: String) : SourceKittenSubstructure {
-            return Json.nonstrict.parse(serializer(), json)
+        fun fromJson(jsonModule: Json, json: String): SourceKittenSubstructure {
+            return jsonModule.decodeFromString(serializer(), json)
         }
     }
 }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftAccessibility.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftAccessibility.kt
index 094a574..8d712ad 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftAccessibility.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftAccessibility.kt
@@ -10,15 +10,15 @@ enum class SwiftAccessibility {
     companion object {
         fun parse(input: String): SwiftAccessibility {
             return when {
-                input == "source.lang.swift.accessibility.open"         -> OPEN
-                input == "source.lang.swift.accessibility.public"       -> PUBLIC
-                input == "source.lang.swift.accessibility.internal"     -> INTERNAL
+                input == "source.lang.swift.accessibility.open" -> OPEN
+                input == "source.lang.swift.accessibility.public" -> PUBLIC
+                input == "source.lang.swift.accessibility.internal" -> INTERNAL
                 input == "source.lang.swift.accessibility.file-private" -> FILE_PRIVATE
-                input == "source.lang.swift.accessibility.private"      -> PRIVATE
-                else                                                    -> throw Exception(
+                input == "source.lang.swift.accessibility.private" -> PRIVATE
+                else -> throw Exception(
                     "Unexpected accessibility kind [$input]"
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftSubstructureKind.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftSubstructureKind.kt
index dc67a98..1a56a92 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftSubstructureKind.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/internal/models/SwiftSubstructureKind.kt
@@ -47,38 +47,40 @@ enum class SwiftSubstructureKind(val kindName: String) {
     IGNORED("")
     ;
 
-
-
     companion object {
         fun parse(input: String, name: String): SwiftSubstructureKind {
             return when {
-                input == "source.lang.swift.decl.class"                                                -> CLASS
-                input == "source.lang.swift.decl.protocol"                                             -> PROTOCOL
-                input == "source.lang.swift.decl.enum"                                                 -> ENUM
-                input == "source.lang.swift.decl.struct"                                               -> STRUCT
+                input == "source.lang.swift.decl.class" -> CLASS
+                input == "source.lang.swift.decl.protocol" -> PROTOCOL
+                input == "source.lang.swift.decl.enum" -> ENUM
+                input == "source.lang.swift.decl.struct" -> STRUCT
 
-                input == "source.lang.swift.decl.typealias"                                            -> TYPEALIAS
-                input == "source.lang.swift.decl.var.global"                                           -> GLOBAL_VARIABLE
+                input == "source.lang.swift.decl.typealias" -> TYPEALIAS
+                input == "source.lang.swift.decl.var.global" -> GLOBAL_VARIABLE
 
-                input == "source.lang.swift.decl.extension"                                            -> EXTENSION
+                input == "source.lang.swift.decl.extension" -> EXTENSION
 
-                input == "source.lang.swift.decl.function.free"                                        -> TOP_LEVEL_FUNCTION
+                input == "source.lang.swift.decl.function.free" -> TOP_LEVEL_FUNCTION
 
-                input == "source.lang.swift.decl.enumcase"                                             -> ENUM_CASE
+                input == "source.lang.swift.decl.enumcase" -> ENUM_CASE
 
-                input == "source.lang.swift.decl.var.static"                                           -> STATIC_VARIABLE
-                input == "source.lang.swift.decl.var.class"                                            -> CLASS_VARIABLE
-                input == "source.lang.swift.decl.var.instance"                                         -> INSTANCE_VARIABLE
-                input == "source.lang.swift.decl.var.local"                                            -> LOCAL_VARIABLE
+                input == "source.lang.swift.decl.var.static" -> STATIC_VARIABLE
+                input == "source.lang.swift.decl.var.class" -> CLASS_VARIABLE
+                input == "source.lang.swift.decl.var.instance" -> INSTANCE_VARIABLE
+                input == "source.lang.swift.decl.var.local" -> LOCAL_VARIABLE
 
-                input == "source.lang.swift.decl.var.parameter"                                        -> PARAMETER
-                input == "source.lang.swift.decl.generic_type_param"                                   -> GENERIC_TYPE_PARAMETER
+                input == "source.lang.swift.decl.var.parameter" -> PARAMETER
+                input == "source.lang.swift.decl.generic_type_param" -> GENERIC_TYPE_PARAMETER
 
-                input == "source.lang.swift.decl.function.method.static"                               -> STATIC_METHOD
-                input == "source.lang.swift.decl.function.method.class"                                -> CLASS_METHOD
-                input == "source.lang.swift.decl.function.method.instance" && name.startsWith("init")  -> INIT_METHOD
-                input == "source.lang.swift.decl.function.method.instance" && !name.startsWith("init") -> INSTANCE_METHOD
-                input == "source.lang.swift.decl.function.subscript"                                   -> SUBSCRIPT_FUNCTION
+                input == "source.lang.swift.decl.function.method.static" -> STATIC_METHOD
+                input == "source.lang.swift.decl.function.method.class" -> CLASS_METHOD
+                input == "source.lang.swift.decl.function.method.instance" && name.startsWith("init") -> {
+                    INIT_METHOD
+                }
+                input == "source.lang.swift.decl.function.method.instance" && !name.startsWith("init") -> {
+                    INSTANCE_METHOD
+                }
+                input == "source.lang.swift.decl.function.subscript" -> SUBSCRIPT_FUNCTION
 
 //                input in listOf(
 //                    "source.lang.swift.expr.call"
@@ -88,43 +90,46 @@ enum class SwiftSubstructureKind(val kindName: String) {
 //                    "Unexpected substructure kind [$input]"
 //                )
 
-                else                                                                                   -> IGNORED
+                else -> IGNORED
             }
         }
     }
 
-    fun format(mainArgs: MainArgs, substructure: SourceKittenSubstructure, structure: SourceKittenSubstructure): DocElement? {
+    fun format(
+        mainArgs: MainArgs,
+        substructure: SourceKittenSubstructure,
+        structure: SourceKittenSubstructure
+    ): DocElement? {
         return when (this) {
-            CLASS                  -> substructure.toClassDoc(mainArgs, structure, true)
-            PROTOCOL               -> substructure.toClassDoc(mainArgs, structure, true)
-            ENUM                   -> substructure.toClassDoc(mainArgs, structure, true)
-            STRUCT                 -> substructure.toClassDoc(mainArgs, structure, true)
+            CLASS -> substructure.toClassDoc(mainArgs, structure, true)
+            PROTOCOL -> substructure.toClassDoc(mainArgs, structure, true)
+            ENUM -> substructure.toClassDoc(mainArgs, structure, true)
+            STRUCT -> substructure.toClassDoc(mainArgs, structure, true)
 
-            TYPEALIAS              -> substructure.toTypealiasDoc(structure)
-            GLOBAL_VARIABLE        -> substructure.toVariableDoc(structure)
+            TYPEALIAS -> substructure.toTypealiasDoc(structure)
+            GLOBAL_VARIABLE -> substructure.toVariableDoc(structure)
 
-            EXTENSION              -> substructure.toExtensionDoc(mainArgs, structure)
+            EXTENSION -> substructure.toExtensionDoc(mainArgs, structure)
 
-            TOP_LEVEL_FUNCTION     -> substructure.toFunctionDoc(structure)
+            TOP_LEVEL_FUNCTION -> substructure.toFunctionDoc(structure)
 
-            ENUM_CASE              -> substructure.toEnumCaseDoc(mainArgs, structure)
+            ENUM_CASE -> substructure.toEnumCaseDoc(mainArgs, structure)
 
-            PARAMETER              -> substructure.toParameterDoc()
+            PARAMETER -> substructure.toParameterDoc()
             GENERIC_TYPE_PARAMETER -> substructure.toTypeParameterDoc()
 
-            STATIC_VARIABLE        -> substructure.toVariableDoc(structure)
-            CLASS_VARIABLE         -> substructure.toVariableDoc(structure)
-            INSTANCE_VARIABLE      -> substructure.toVariableDoc(structure)
-            LOCAL_VARIABLE         -> substructure.toVariableDoc(structure)
+            STATIC_VARIABLE -> substructure.toVariableDoc(structure)
+            CLASS_VARIABLE -> substructure.toVariableDoc(structure)
+            INSTANCE_VARIABLE -> substructure.toVariableDoc(structure)
+            LOCAL_VARIABLE -> substructure.toVariableDoc(structure)
 
-            INIT_METHOD            -> substructure.toFunctionDoc(structure)
-            STATIC_METHOD          -> substructure.toFunctionDoc(structure)
-            CLASS_METHOD           -> substructure.toFunctionDoc(structure)
-            INSTANCE_METHOD        -> substructure.toFunctionDoc(structure)
-            SUBSCRIPT_FUNCTION     -> substructure.toFunctionDoc(structure)
+            INIT_METHOD -> substructure.toFunctionDoc(structure)
+            STATIC_METHOD -> substructure.toFunctionDoc(structure)
+            CLASS_METHOD -> substructure.toFunctionDoc(structure)
+            INSTANCE_METHOD -> substructure.toFunctionDoc(structure)
+            SUBSCRIPT_FUNCTION -> substructure.toFunctionDoc(structure)
 
-            IGNORED                -> null
+            IGNORED -> null
         }
     }
-
 }
diff --git a/swiftdoc/swiftdoc-formatter/src/main/kotlin/main.kt b/swiftdoc/swiftdoc-formatter/src/main/kotlin/main.kt
index 5cbf574..97a1ce5 100644
--- a/swiftdoc/swiftdoc-formatter/src/main/kotlin/main.kt
+++ b/swiftdoc/swiftdoc-formatter/src/main/kotlin/main.kt
@@ -1,18 +1,26 @@
 package com.copperleaf.kodiak.swift
 
-import com.caseyjbrooks.clog.Clog
+import clog.Clog
+import clog.dsl.addTagToBlacklist
 import com.copperleaf.kodiak.swift.internal.models.SwiftAccessibility
 import com.eden.orchid.api.cli.Cli
 import com.eden.orchid.api.options.annotations.Option
 import com.eden.orchid.api.options.annotations.StringDefault
+import kotlinx.serialization.json.Json
 import java.io.File
 import java.nio.file.Path
 
 fun main(vararg args: String) {
-    Clog.getInstance().addTagToBlacklist("FlagsParser")
+    Clog.addTagToBlacklist("FlagsParser")
 
     val mainArgs = Cli.parseArgsInto(MainArgs(), args)
 
+    val jsonModule = Json {
+        isLenient = true
+        prettyPrint = true
+        ignoreUnknownKeys = true
+    }
+
     SourcekittenWrapper(mainArgs).use { sourceKitten ->
         sourceKitten.cacheSourceKittenBinary()
         sourceKitten.printSourceKittenVersion()
@@ -20,7 +28,8 @@ fun main(vararg args: String) {
         SwiftdocFileParser(
             mainArgs,
             sourceKitten,
-            SwiftdocRemapper(mainArgs)
+            SwiftdocRemapper(mainArgs),
+            jsonModule
         ).processAll()
     }
 }
@@ -63,7 +72,7 @@ class MainArgs {
     }
 }
 
-internal fun newFile(name: String) : File = File(name).apply {
+internal fun newFile(name: String): File = File(name).apply {
     if (!parentFile.exists()) {
         parentFile.mkdirs()
     }
diff --git a/swiftdoc/swiftdoc-models/build.gradle.kts b/swiftdoc/swiftdoc-models/build.gradle.kts
index 9d0d56c..62e9652 100644
--- a/swiftdoc/swiftdoc-models/build.gradle.kts
+++ b/swiftdoc/swiftdoc-models/build.gradle.kts
@@ -1,5 +1,9 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/models.gradle")
-
-dependencies {
-    "compile"(project(":common:common-models"))
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-models`
+    `copper-leaf-publish`
 }
+
+description = "Kodiak - Swiftdoc Models"
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftClass.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftClass.kt
index ea27084..0013c86 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftClass.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftClass.kt
@@ -1,17 +1,16 @@
 package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
-import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
-import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.RichTextComponent.Companion.TYPE_NAME
 import com.copperleaf.kodiak.common.SpecializedDocElement
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -37,22 +36,24 @@ data class SwiftClass(
     val methods: List<SwiftMethod>,
     val fields: List<SwiftField>,
     override val signature: List<RichTextComponent>
-) : DocElement, AutoDocument, SpecializedDocElement, JsonableDocElement, TopLevel {
+) : JsonableDocElement, AutoDocument, SpecializedDocElement, TopLevel {
 
     override val kind = "Class"
 
-    override val parents = listOfNotNull(superclass, *protocols.toTypedArray())
-    override val contexts = listOf(RichTextComponent(TYPE_NAME, sourceFile, sourceFile))
+    override val parents: List<RichTextComponent>
+        get() = listOfNotNull(superclass, *protocols.toTypedArray())
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::fields),
-        fromDocList(::constructors),
-        fromDocList(::methods)
-    )
-
-    @UseExperimental(UnstableDefault::class)
-    override fun toJson(): String {
-        return Json.indented.stringify(serializer(), this)
+    override val contexts: List<RichTextComponent>
+        get() = listOf(RichTextComponent(TYPE_NAME, sourceFile, sourceFile))
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::fields),
+            fromDocList(::constructors),
+            fromDocList(::methods)
+        )
+
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftConstructor.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftConstructor.kt
index 1106407..c9c17f9 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftConstructor.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftConstructor.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -26,8 +27,8 @@ data class SwiftConstructor(
 ) : DocElement, AutoDocument {
     override val kind = "Constructor"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters)
+        )
 }
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftExtension.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftExtension.kt
index 0b44313..6dcf57d 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftExtension.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftExtension.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.SpecializedDocElement
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
@@ -32,9 +33,9 @@ data class SwiftExtension(
 
     override val kind = "Extension"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::fields),
-        fromDocList(::methods)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::fields),
+            fromDocList(::methods)
+        )
 }
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftField.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftField.kt
index 39619cd..6185d74 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftField.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftField.kt
@@ -2,9 +2,9 @@ package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
 import com.copperleaf.kodiak.common.AutoDocumentNode
-import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.ElementType
+import com.copperleaf.kodiak.common.RichTextComponent
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
@@ -27,7 +27,6 @@ data class SwiftField(
 ) : ElementType, AutoDocument {
     override val kind = "Field"
 
-    @Transient
-    override val nodes = emptyList<AutoDocumentNode>()
-
+    override val nodes: List<AutoDocumentNode>
+        get() = emptyList()
 }
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftMethod.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftMethod.kt
index df650ca..1064e49 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftMethod.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftMethod.kt
@@ -1,9 +1,10 @@
 package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.SpecializedDocElement
 import com.copperleaf.kodiak.common.fromDoc
 import com.copperleaf.kodiak.common.fromDocList
@@ -31,9 +32,9 @@ data class SwiftMethod(
 
     override val kind = "Method"
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::parameters),
-        fromDoc(::returnValue)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::parameters),
+            fromDoc(::returnValue)
+        )
 }
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftModuleDoc.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftModuleDoc.kt
index c5b0e6e..6878b47 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftModuleDoc.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftModuleDoc.kt
@@ -1,5 +1,6 @@
 package com.copperleaf.kodiak.swift.models
 
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocElement
 import com.copperleaf.kodiak.common.ModuleDoc
 import com.copperleaf.kodiak.common.fromDocList
@@ -12,10 +13,11 @@ class SwiftModuleDoc(
     val classes: List<SwiftClass>
 ) : ModuleDoc {
 
-    override val nodes = listOf(
-        fromDocList(::sourceFiles),
-        fromDocList(::classes)
-    )
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::sourceFiles),
+            fromDocList(::classes)
+        )
 
     override fun roots(): List<DocElement> {
         return emptyList()
diff --git a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftSourceFile.kt b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftSourceFile.kt
index 3294b96..9aae80f 100644
--- a/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftSourceFile.kt
+++ b/swiftdoc/swiftdoc-models/src/main/kotlin/SwiftSourceFile.kt
@@ -1,14 +1,15 @@
 package com.copperleaf.kodiak.swift.models
 
 import com.copperleaf.kodiak.common.AutoDocument
-import com.copperleaf.kodiak.common.RichTextComponent
+import com.copperleaf.kodiak.common.AutoDocumentNode
 import com.copperleaf.kodiak.common.DocComment
 import com.copperleaf.kodiak.common.DocElement
+import com.copperleaf.kodiak.common.JsonableDocElement
+import com.copperleaf.kodiak.common.RichTextComponent
 import com.copperleaf.kodiak.common.TopLevel
 import com.copperleaf.kodiak.common.fromDocList
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 
 /**
@@ -31,23 +32,25 @@ data class SwiftSourceFile(
     val typealiases: List<SwiftTypealias>,
     val extensions: List<SwiftExtension>,
     override val signature: List<RichTextComponent>
-) : DocElement, AutoDocument, TopLevel {
+) : DocElement, AutoDocument, TopLevel, JsonableDocElement {
     override val kind = "SourceFile"
 
-    override val parents = listOf<RichTextComponent>()
-    override val contexts = emptyList<RichTextComponent>()
+    override val parents: List<RichTextComponent>
+        get() = emptyList()
 
-    @Transient
-    override val nodes = listOf(
-        fromDocList(::classes),
-        fromDocList(::variables),
-        fromDocList(::functions),
-        fromDocList(::typealiases),
-        fromDocList(::extensions)
-    )
-
-    @UseExperimental(UnstableDefault::class)
-    fun toJson(): String {
-        return Json.indented.stringify(serializer(), this)
+    override val contexts: List<RichTextComponent>
+        get() = emptyList()
+
+    override val nodes: List<AutoDocumentNode>
+        get() = listOf(
+            fromDocList(::classes),
+            fromDocList(::variables),
+            fromDocList(::functions),
+            fromDocList(::typealiases),
+            fromDocList(::extensions)
+        )
+
+    override fun toJson(json: Json): String {
+        return json.encodeToString(serializer(), this)
     }
 }
diff --git a/swiftdoc/swiftdoc-runner/build.gradle.kts b/swiftdoc/swiftdoc-runner/build.gradle.kts
index c31bbc6..4bd3f39 100644
--- a/swiftdoc/swiftdoc-runner/build.gradle.kts
+++ b/swiftdoc/swiftdoc-runner/build.gradle.kts
@@ -1,18 +1,24 @@
-apply(from = "${rootProject.rootDir}/gradle/groups/runners.gradle")
+plugins {
+    `copper-leaf-base`
+    `copper-leaf-version`
+    `copper-leaf-lint`
+    `kodiak-runners`
+    `copper-leaf-publish`
+}
+
+description = "Kodiak - Swiftdoc Runner"
 
 dependencies {
-    "compile"(project(":common:common-runner"))
-    "compile"(project(":swiftdoc:swiftdoc-models"))
+    api(project(":common:common-runner"))
+    api(project(":swiftdoc:swiftdoc-models"))
 }
 
 // wait to build this project until after the formatter is built, because we want to bundle the formatter as a resource
 // in this project
 val formatterProject = project(":swiftdoc:swiftdoc-formatter")
+val formatterProjectShadowJar by formatterProject.tasks.named("shadowJar")
 
-val thisProjectAssemble = tasks.getByName("assemble")
-val formatterProjectAssemble = formatterProject.tasks.getByName("assemble")
-thisProjectAssemble.dependsOn(formatterProjectAssemble)
-
-(tasks.getByName("processResources") as ProcessResources).apply {
+tasks.withType<ProcessResources> {
+    dependsOn(formatterProjectShadowJar)
     from("${formatterProject.buildDir}/libs/swiftdoc-formatter-$version-all.zip")
 }
diff --git a/swiftdoc/swiftdoc-runner/src/main/kotlin/lib.kt b/swiftdoc/swiftdoc-runner/src/main/kotlin/SwiftdocInvokerImpl.kt
similarity index 72%
rename from swiftdoc/swiftdoc-runner/src/main/kotlin/lib.kt
rename to swiftdoc/swiftdoc-runner/src/main/kotlin/SwiftdocInvokerImpl.kt
index 6985324..5e6de7a 100644
--- a/swiftdoc/swiftdoc-runner/src/main/kotlin/lib.kt
+++ b/swiftdoc/swiftdoc-runner/src/main/kotlin/SwiftdocInvokerImpl.kt
@@ -31,13 +31,14 @@ class SwiftdocInvokerImpl(
         return arrayOf(
             "java",
             "-Xms$startMemory", "-Xmx$maxMemory",
-            "-classpath", formatterJar.toFile().absolutePath,    // classpath of embedded formatter jar
-            "com.copperleaf.kodiak.swift.MainKt",               // Swiftdoc Formatter main class
-            "--src", sourceDirs.map { it.toFile().absolutePath }
-                .joinToString(separator = File.pathSeparator),   // the sources to process
-            "--output", destinationDir.toFile().absolutePath,    // where Orchid will find them later
-            "--cacheDir", cacheDir.toFile().absolutePath,        // where Orchid will find them later
-            *args.toTypedArray()                                 // allow additional arbitrary args
+            "-classpath", formatterJar.toFile().absolutePath, // classpath of embedded formatter jar
+            "com.copperleaf.kodiak.swift.MainKt", // Swiftdoc Formatter main class
+            "--src",
+            sourceDirs.map { it.toFile().absolutePath }
+                .joinToString(separator = File.pathSeparator), // the sources to process
+            "--output", destinationDir.toFile().absolutePath, // where Orchid will find them later
+            "--cacheDir", cacheDir.toFile().absolutePath, // where Orchid will find them later
+            *args.toTypedArray() // allow additional arbitrary args
         )
     }
 
@@ -47,5 +48,4 @@ class SwiftdocInvokerImpl(
             getDocsInSubdirectory(destinationDir, "Class", SwiftClass.serializer())
         )
     }
-
 }
diff --git a/swiftdoc/swiftdoc-runner/src/test/kotlin/SwiftdocJsonRunnerTest.kt b/swiftdoc/swiftdoc-runner/src/test/kotlin/SwiftdocJsonRunnerTest.kt
index 0a52cbd..a99e7ed 100644
--- a/swiftdoc/swiftdoc-runner/src/test/kotlin/SwiftdocJsonRunnerTest.kt
+++ b/swiftdoc/swiftdoc-runner/src/test/kotlin/SwiftdocJsonRunnerTest.kt
@@ -3,15 +3,14 @@ package com.copperleaf.kodiak.swift
 import com.copperleaf.kodiak.common.DocInvoker
 import com.copperleaf.kodiak.swift.models.SwiftModuleDoc
 import com.eden.common.util.IOStreamUtils
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import strikt.api.expectThat
-import strikt.assertions.isNotEmpty
-import strikt.assertions.isNotNull
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 class SwiftdocJsonRunnerTest {
 
@@ -39,16 +38,15 @@ class SwiftdocJsonRunnerTest {
     }
 
     private fun cleanupProjectDirs() {
-
     }
 
-    @BeforeEach
+    @Before
     internal fun setUp() {
         if (useTempDirs) initTempDirs() else initProjectDirs()
         swiftdocRunner = SwiftdocInvokerImpl(cacheDir)
     }
 
-    @AfterEach
+    @After
     internal fun tearDown() {
         if (useTempDirs) cleanupTempDirs() else cleanupProjectDirs()
     }
@@ -60,10 +58,8 @@ class SwiftdocJsonRunnerTest {
             outputDir
         ) { inputStream -> IOStreamUtils.InputStreamPrinter(inputStream, null) }
 
-        expectThat(rootDoc)
-            .isNotNull()
-            .and { get { sourceFiles }.isNotEmpty() }
-            .and { get { classes }.isNotEmpty() }
+        assertNotNull(rootDoc)
+        assertTrue(rootDoc.sourceFiles.isNotEmpty())
+        assertTrue(rootDoc.classes.isNotEmpty())
     }
-
 }