You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/29 16:12:48 UTC

[isis] 04/04: ISIS-2062: docs

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git

commit d6cbdd45ca7b2001d703eb5ad20a651ba3059fe0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 16:08:53 2020 +0000

    ISIS-2062: docs
---
 .../_component-template/antora.yml                 |   0
 .../_component-template/modules/ROOT/nav.adoc      |   0
 .../modules/ROOT/pages/about.adoc                  |   0
 .../modules/_module-template/attachments}/.gitkeep |   0
 .../modules/_module-template}/examples/.gitkeep    |   0
 .../modules/_module-template/images}/.gitkeep      |   0
 .../modules/_module-template}/nav.adoc             |   0
 .../modules/_module-template}/pages/about.adoc     |   0
 .../modules/_module-template/partials}/.gitkeep    |   0
 antora/playbooks/site-core.yml                     |   8 +--
 antora/playbooks/site-extensions.yml               |   2 +-
 antora/playbooks/site-incubator.yml                |   8 +--
 antora/playbooks/site-legacy.yml                   |   8 +--
 antora/playbooks/site-mappings.yml                 |   8 +--
 antora/playbooks/site-pjdo.yml                     |   2 +-
 antora/playbooks/site-refguide.yml                 |   8 +--
 antora/playbooks/site-security.yml                 |   8 +--
 antora/playbooks/site-starters.yml                 |   2 +-
 antora/playbooks/site-subdomains.yml               |   8 +--
 antora/playbooks/site-testing.yml                  |   2 +-
 antora/playbooks/site-toc.yml                      |   2 +-
 antora/playbooks/site-userguide.yml                |   8 +--
 antora/playbooks/site-valuetypes.yml               |  14 ++---
 antora/playbooks/site-vro.yml                      |   2 +-
 antora/playbooks/site-vw.yml                       |   2 +-
 antora/playbooks/site.yml                          |  58 ++++++++++-----------
 antora/{components => }/toc/antora.yml             |   0
 .../toc/modules/ROOT/attachments/.gitkeep          |   0
 .../images => toc/modules/ROOT/examples}/.gitkeep  |   0
 .../ROOT/images/going-deeper/books/dhnako.jpg      | Bin
 .../going-deeper/books/nakedobjects-book.jpg       | Bin
 .../toc/modules/ROOT/images/more-thanks/ecp.png    | Bin
 .../ROOT/images/more-thanks/ecp_logo_white.png     | Bin
 .../ROOT/images/more-thanks/ej-technologies.png    | Bin
 .../ROOT/images/more-thanks/icons8-logo.png        | Bin
 .../modules/ROOT/images/more-thanks/s101_170.png   | Bin
 .../toc/modules/ROOT/images/support/slack/010.png  | Bin
 .../toc/modules/ROOT/images/support/slack/020.png  | Bin
 .../toc/modules/ROOT/images/support/slack/030.png  | Bin
 .../toc/modules/ROOT/images/support/slack/040.png  | Bin
 .../toc/modules/ROOT/images/support/slack/050.png  | Bin
 .../toc/modules/ROOT/images/support/slack/060.png  | Bin
 .../toc/modules/ROOT/images/support/slack/070.png  | Bin
 .../toc/modules/ROOT/images/support/slack/080.png  | Bin
 .../toc/modules/ROOT/images/support/slack/090.png  | Bin
 .../toc/modules/ROOT/images/support/slack/100.png  | Bin
 .../toc/modules/ROOT/images/support/slack/110.png  | Bin
 ...15-HealthAssessmentReport_DRCP594591_138322.pdf | Bin
 ...9-HealthAssessmentReport_DRCJ1712475_138322.pdf | Bin
 .../toc/modules/ROOT/images/tv_show-25.png         | Bin
 .../isis-in-pictures/010-login.png                 | Bin
 .../isis-in-pictures/020-install-fixtures.png      | Bin
 .../isis-in-pictures/030-dashboard-view-model.png  | Bin
 .../isis-in-pictures/040-domain-entity.png         | Bin
 .../isis-in-pictures/050-edit-property.png         | Bin
 .../isis-in-pictures/060-invoke-action.png         | Bin
 .../isis-in-pictures/065-contributions.png         | Bin
 .../isis-in-pictures/067-contributed-action.png    | Bin
 .../isis-in-pictures/070-pluggable-views.png       | Bin
 .../isis-in-pictures/080-gmap3-view.png            | Bin
 .../isis-in-pictures/090-fullcalendar2-view.png    | Bin
 .../isis-in-pictures/100-excel-view-and-docx.png   | Bin
 .../isis-in-pictures/110-docx.png                  | Bin
 .../isis-in-pictures/120-auditing.png              | Bin
 .../isis-in-pictures/130-security.png              | Bin
 .../isis-in-pictures/140-i18n.png                  | Bin
 .../isis-in-pictures/150-appsettings.png           | Bin
 .../isis-in-pictures/160-switch-tenancy.png        | Bin
 .../isis-in-pictures/170-me.png                    | Bin
 .../isis-in-pictures/180-app-user-entity.png       | Bin
 .../isis-in-pictures/190-switch-theme.png          | Bin
 .../isis-in-pictures/200-rest-api.png              | Bin
 .../isis-in-pictures/205-swagger-ui.png            | Bin
 .../isis-in-pictures/210-fixture-scripts.png       | Bin
 .../isis-in-pictures/220-testing-happy-case.png    | Bin
 .../230-testing-wrapper-factory.png                | Bin
 .../isis-in-pictures/240-domain-events.png         | Bin
 .../250-domain-event-subscriber.png                | Bin
 .../isis-in-pictures/260-domain-event-test.png     | Bin
 .../powered-by/commapp/screenshot-1.png            | Bin
 .../powered-by/commapp/screenshot-2.png            | Bin
 .../powered-by/cqnz/cqnz-advert.png                | Bin
 .../powered-by/estatio/est-home-page.png           | Bin
 .../powered-by/estatio/est-invoice.png             | Bin
 .../estatio/est-payment-batch-manager.png          | Bin
 .../powered-by/estatio/estatio-1.png               | Bin
 .../gesconsultor-grc/fig-1-custom-viewer.png       | Bin
 .../fig-2-custom-drag-n-drop-interface.png         | Bin
 .../fig-3-custom-ui-analyzing-risk-scenarios.png   | Bin
 .../gesconsultor-grc/fig-4-managing-projects.png   | Bin
 .../transportplanner/TransportDemand.png           | Bin
 antora/{components => }/toc/modules/ROOT/nav.adoc  |   0
 .../toc/modules/ROOT/pages/about.adoc              |   0
 .../toc/modules/ROOT/pages/downloads/how-to.adoc   |   0
 .../going-deeper/articles-and-presentations.adoc   |   0
 .../toc/modules/ROOT/pages/going-deeper/books.adoc |   0
 .../modules/ROOT/pages/landing-page/catalogs.adoc  |   0
 .../ROOT/pages/landing-page/components.adoc        |   0
 .../modules/ROOT/pages/landing-page/guides.adoc    |   0
 .../modules/ROOT/pages/landing-page/internal.adoc  |   0
 .../modules/ROOT/pages/landing-page/releases.adoc  |   0
 .../modules/ROOT/pages/landing-page/support.adoc   |   0
 .../ROOT/pages/more-thanks/more-thanks.adoc        |   0
 .../modules/ROOT/pages/support/mailing-list.adoc   |   0
 .../modules/ROOT/pages/support/slack-channel.adoc  |   0
 .../what-is-apache-isis/common-use-cases.adoc      |   0
 .../what-is-apache-isis/isis-in-pictures.adoc      |   0
 .../ROOT/pages/what-is-apache-isis/powered-by.adoc |   0
 .../what-is-apache-isis/powered-by/commapp.adoc    |   0
 .../what-is-apache-isis/powered-by/contactapp.adoc |   0
 .../pages/what-is-apache-isis/powered-by/cqnz.adoc |   0
 .../what-is-apache-isis/powered-by/estatio.adoc    |   0
 .../powered-by/gesconsultor-grc.adoc               |   0
 .../powered-by/transport-planner.adoc              |   0
 .../what-is-apache-isis/screencasts-older.adoc     |   0
 .../pages/what-is-apache-isis/screencasts.adoc     |   0
 .../what-is-apache-isis/screencasts/playlists.adoc |   0
 .../toc/modules/ROOT/partials/component-nav.adoc   |   0
 .../toc/modules/ROOT/partials/module-nav.adoc      |   0
 .../images/committers/github-pr-history.png        | Bin
 .../images/docker/020-docker-nat-public.png        | Bin
 .../images/docker/022-local-security-policy.png    | Bin
 .../images/docker/024-unidentified-are-private.png | Bin
 .../images/docker/026-docker-nat-private.png       | Bin
 .../comguide/images/docker/docker-daemon.png       | Bin
 .../release-process/jira-create-release-notes.png  | Bin
 .../images/release-process/nexus-release-1.png     | Bin
 .../images/release-process/nexus-staging-0.png     | Bin
 .../images/release-process/nexus-staging-1.png     | Bin
 .../images/release-process/nexus-staging-2.png     | Bin
 .../images/release-process/nexus-staging-2a.png    | Bin
 .../images/release-process/nexus-staging-3.png     | Bin
 .../images/release-process/nexus-staging-4.png     | Bin
 .../relnotes => toc/modules/comguide}/nav.adoc     |   0
 .../toc/modules/comguide/pages/about.adoc          |   0
 .../comguide/pages/antora-publish-procedure.adoc   |   0
 .../modules/comguide/pages/applying-patches.adoc   |   0
 .../modules/comguide/pages/cutting-a-release.adoc  |   0
 .../toc/modules/comguide/pages/key-generation.adoc |   0
 .../comguide/pages/merging-a-pull-request.adoc     |   0
 .../toc/modules/comguide/pages/pmc-notes.adoc      |   0
 .../toc/modules/comguide/pages/policies.adoc       |   0
 .../comguide/pages/policies/git-policy.adoc        |   0
 .../comguide/pages/policies/versioning-policy.adoc |   0
 .../comguide/pages/post-release-successful.adoc    |   0
 .../comguide/pages/post-release-unsuccessful.adoc  |   0
 .../release-process-for-interim-releases.adoc      |   0
 .../pages/release-process-for-snapshots.adoc       |   0
 .../comguide/pages/release-process-prereqs.adoc    |   0
 .../modules/comguide/pages/verifying-releases.adoc |   0
 .../asciidoc-syntax-quick-reference.pdf            | Bin
 .../attachments/asciidoc-writers-guide.pdf         | Bin
 .../eclipse/Apache-Isis-code-style-cleanup.xml     |   0
 .../eclipse/Apache-code-style-formatting.xml       |   0
 .../eclipse/Apache-code-style-template.xml         |   0
 .../attachments/eclipse/isis-templates.xml         |   0
 .../devguide/attachments/eclipse/isis.importorder  |   0
 .../attachments/eclipse/jmock2-templates.xml       |   0
 .../attachments/eclipse/junit4-templates.xml       |   0
 .../devguide/attachments/intellij/.gitignore       |   0
 .../intellij/isis-settings-file-templates.jar      | Bin
 .../devguide/attachments/intellij/other/.gitignore |   0
 .../intellij/other/dan-settings-keymaps.jar        | Bin
 .../attachments/resources/IsisCheatSheet.docx      | Bin
 .../attachments/resources/IsisCheatSheet.pdf       | Bin
 .../devguide/images/asciidoctor/ditaa-demo.png     | Bin
 .../devguide/images/asciidoctor/graphviz-demo.png  | Bin
 .../devguide/images/asciidoctor/plantuml-demo.png  | Bin
 .../images/building-apache-isis/setting-up-git.png | Bin
 .../devguide/images/contributing/git-workflow.png  | Bin
 .../devguide/images/contributing/git-workflow.pptx | Bin
 .../images/contributing/github-cloning.png         | Bin
 .../images/contributing/github-forking.png         | Bin
 .../eclipse/2017-oxygen/010-lombok-locate-jar.png  | Bin
 .../020-lombok-install-into-eclipse.png            | Bin
 .../030-datanucleus-install-new-software.png       | Bin
 .../040-datanucleus-specify-repository.png         | Bin
 .../2017-oxygen/050-datanucleus-select-plugin.png  | Bin
 .../060-enable-annotation-processor.png            | Bin
 .../eclipse/eclipse-010-windows-preferences.png    | Bin
 .../eclipse/eclipse-025-project-properties.png     | Bin
 .../images/eclipse/eclipse-100-project-support.png | Bin
 .../images/eclipse/eclipse-110-project-support.png | Bin
 .../images/eclipse/eclipse-120-console.png         | Bin
 .../eclipse-200-enhancer-fails-duplicates.png      | Bin
 .../eclipse-210-enhancer-fails-duplicates.png      | Bin
 .../eclipse-220-enhancer-fails-duplicates.png      | Bin
 .../010-installing/010-welcome-page.png            | Bin
 .../010-installing/020-choose-location.png         | Bin
 .../010-installing/030-installation-options.png    | Bin
 .../010-installing/040-start-menu-folder.png       | Bin
 .../010-installing/050-completing.png              | Bin
 .../010-installing/060-import-settings-or-not.png  | Bin
 .../010-installing/070-set-ui-theme.png            | Bin
 .../010-new-project-create.png                     | Bin
 .../020-java-project-setup-jdk.png                 | Bin
 .../030-java-project-select-jdk.png                | Bin
 .../020-create-new-project/040-sdk-selected.png    | Bin
 .../050-name-and-location.png                      | Bin
 .../020-create-new-project/060-create-dir.png      | Bin
 .../010-settings-import-jar.png                    | Bin
 .../030-import-settings/020-select-all.png         | Bin
 .../030-import-settings/030-restart.png            | Bin
 .../030-import-settings/040-file-templates.png     | Bin
 .../030-import-settings/050-live-templates.png     | Bin
 .../010-build-automatically.png                    | Bin
 .../020-annotation-processor.png                   | Bin
 .../010-maven-installation.png                     | Bin
 .../020-maven-configuration.png                    | Bin
 .../044-other-settings-misc/010-auto-import.png    | Bin
 .../050-some-plugins/010-some-plugins.png          | Bin
 .../020-some-plugins-confirmation.png              | Bin
 .../maven-helper/010-dependency-tab.png            | Bin
 .../maven-helper/020-dependency-as-tree.png        | Bin
 .../maven-helper/030-maven-run-goal.png            | Bin
 .../maven-helper/040-maven-quick-run.png           | Bin
 .../060-troubleshooting/010-duplicate-classes.png  | Bin
 .../070-advanced/002-compiler-exclude.png          | Bin
 .../070-advanced/004-gradle-output.png             | Bin
 .../070-advanced/005-gradle-output.png             | Bin
 .../070-advanced/006-livereload-js.png             | Bin
 .../010-dcevm-list-of-found-jdk-installations.png  | Bin
 .../070-advanced/020-dcevm-once-installed.png      | Bin
 .../030-dcevm-intellij-project-structure.png       | Bin
 .../070-advanced/040-dcevm-run-configuration.png   | Bin
 .../010-maven-modules-view.png                     | Bin
 .../020-adding-another-module.png                  | Bin
 .../030-other-module-added.png                     | Bin
 .../100-maven-module-mgmt/040-ignoring-modules.png | Bin
 .../050-ignoring-modules-2.png                     | Bin
 .../100-maven-module-mgmt/060-ignored-modules.png  | Bin
 .../110-running-the-app/010-run-configuration.png  | Bin
 .../020-datanucleus-enhancer-goal.png              | Bin
 .../110-running-the-app/030-running-unit-tests.png | Bin
 .../040-running-unit-tests-run-configuration.png   | Bin
 ...running-integration-tests-run-configuration.png | Bin
 .../200-project-sdk/010-file-project-structure.png | Bin
 .../200-project-sdk/020-select-jdk.png             | Bin
 .../200-project-sdk/030-select-jdk-directory.png   | Bin
 .../200-project-sdk/040-set-project-level.png      | Bin
 .../200-project-sdk/050-isis-language-level-7.png  | Bin
 .../200-project-sdk/060-app-language-level-8.png   | Bin
 .../250-new-project/010-new-project.png            | Bin
 .../250-new-project/020-new-project-name.png       | Bin
 .../250-new-project/030-new-project-new-window.png | Bin
 .../040-new-module-from-existing-sources.png       | Bin
 .../250-new-project/050-specify-source-folder.png  | Bin
 .../250-new-project/060-import-using-maven.png     | Bin
 .../250-new-project/070-import-module-settings.png | Bin
 .../250-new-project/080-maven-profiles.png         | Bin
 .../250-new-project/090-maven-coordinates.png      | Bin
 .../250-new-project/100-annotation-processing.png  | Bin
 .../250-new-project/110-parameter8.png             | Bin
 .../250-new-project/120-clean-generate-sources.png | Bin
 .../010-configuring-the-compiler.png               | Bin
 .../run-debug-configuration-single-module.png      | Bin
 .../devguide/images/layouts/estatio-Lease.png      | Bin
 .../devguide/images/resources/IsisCheatSheet.png   | Bin
 .../mignotes => toc/modules/devguide}/nav.adoc     |   0
 .../toc/modules/devguide/pages/about.adoc          |   0
 .../toc/modules/devguide/pages/agilej.adoc         |   0
 .../modules/devguide/pages/asciidoc-syntax.adoc    |   0
 .../devguide/pages/building-apache-isis.adoc       |   0
 .../devguide/pages/building-docs-and-website.adoc  |   0
 .../toc/modules/devguide/pages/cmd-line.adoc       |   0
 .../toc/modules/devguide/pages/contributing.adoc   |   0
 .../toc/modules/devguide/pages/git-cookbook.adoc   |   0
 .../toc/modules/devguide/pages/hints-and-tips.adoc |   0
 .../pages/hints-and-tips/datanucleus-enhancer.adoc |   0
 .../pages/hints-and-tips/enabling-logging.adoc     |   0
 .../pages/hints-and-tips/enhance-only.adoc         |   0
 .../how-run-fixtures-on-app-startup.adoc           |   0
 .../toc/modules/devguide/pages/ide.adoc            |   0
 .../toc/modules/devguide/pages/ide/eclipse.adoc    |   0
 .../toc/modules/devguide/pages/ide/intellij.adoc   |   0
 .../toc/modules/devguide/pages/project-lombok.adoc |   0
 .../devguide/pages/resources/cheat-sheet.adoc      |   0
 .../modules/devguide/pages/resources/icons.adoc    |   0
 .../devguide/pages/working-with-many-repos.adoc    |   0
 .../toc/modules/devguide/partials/x.sh             |   0
 .../devguide => toc/modules/mignotes}/nav.adoc     |   0
 .../toc/modules/mignotes/pages/about.adoc          |   0
 .../modules/mignotes/pages/migrating-to-2.0.0.adoc |   0
 .../mignotes/pages/mn-1.10.0-to-1.11.0.adoc        |   0
 .../mignotes/pages/mn-1.11.0-to-1.12.0.adoc        |   0
 .../mignotes/pages/mn-1.12.0-to-1.13.0.adoc        |   0
 .../mignotes/pages/mn-1.13.0-to-1.14.0.adoc        |   0
 .../mignotes/pages/mn-1.14.0-to-1.15.0.adoc        |   0
 .../mignotes/pages/mn-1.15.0-to-1.16.0.adoc        |   0
 .../mignotes/pages/mn-1.16.0-to-1.17.0.adoc        |   0
 .../mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc      |   0
 .../mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc      |   0
 .../mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc    |   0
 .../mn-1.16.0-to-2.0.0-M1_moved-types.adoc         |   0
 .../mn-1.16.0-to-2.0.0-M1_other-changes.adoc       |   0
 .../mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc |   0
 ...-2.0.0-M1_removed-configuration-properties.adoc |   0
 .../mn-1.16.0-to-2.0.0-M1_removed-types.adoc       |   0
 .../mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc |   0
 .../mn-1.16.0-to-2.0.0-M1_updated-classes.adoc     |   0
 .../modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc  |   0
 .../modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc  |   0
 .../modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc  |   0
 ...0-to-1.9.0_bootstrapping-using-AppManifest.adoc |   0
 .../mn-1.8.0-to-1.9.0_exception-recognizer.adoc    |   0
 ...9.0_fixture-scripts-specification-provider.adoc |   0
 ...mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc |   0
 .../mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc        |   0
 .../mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc      |   0
 .../mn-1.8.0-to-1.9.0_war-packaging.adoc           |   0
 .../modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc |   0
 .../comguide => toc/modules/relnotes}/nav.adoc     |   0
 .../toc/modules/relnotes/pages/about.adoc          |   0
 .../toc/modules/relnotes/pages/rn-1.0.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.0.1.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.1.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.10.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.11.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.11.1.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.12.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.12.1.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.12.2.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.13.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.13.1.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.13.2.1.adoc    |   0
 .../toc/modules/relnotes/pages/rn-1.13.2.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.14.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.15.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.15.1.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.16.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.16.1.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.16.2.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.17.0.adoc      |   0
 .../toc/modules/relnotes/pages/rn-1.2.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.3.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.3.1.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.4.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.4.1.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.5.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.6.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.7.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.8.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-1.9.0.adoc       |   0
 .../toc/modules/relnotes/pages/rn-2.0.0-M1.adoc    |   0
 .../toc/modules/relnotes/pages/rn-2.0.0-M2.adoc    |   0
 .../components => api/adoc}/refguide/antora.yml    |   0
 .../adoc}/refguide/modules/ROOT/nav.adoc           |   0
 .../adoc}/refguide/modules/ROOT/pages/about.adoc   |   0
 .../modules/ROOT/partials/component-nav.adoc       |   0
 .../refguide/modules/ROOT/partials/module-nav.adoc |   0
 .../components => api/adoc}/userguide/antora.yml   |   0
 .../adoc}/userguide/modules/ROOT/nav.adoc          |   0
 .../adoc}/userguide/modules/ROOT/pages/about.adoc  |   0
 .../modules/ROOT/partials/component-nav.adoc       |   0
 .../modules/ROOT/partials/module-nav.adoc          |   0
 .../modules/_to-repurpose/attachments}/.gitkeep    |   0
 ...alysis-of-commands-vs-eventmetadata-vs-etc.xlsx | Bin
 ...mand-dto-vs-interaction-dto-vs-interaction.xlsx | Bin
 .../pptx/commands-vs-actioninvocationevent.pptx    | Bin
 .../_to-repurpose/attachments/theme/isis-logo.png  | Bin
 .../modules/_to-repurpose/examples}/.gitkeep       |   0
 .../modules/_to-repurpose/images/.gitkeep          |   0
 .../modules/_to-repurpose/images/PDF-50.png        | Bin
 .../images/index-screenshots/010-sign-in.pdn       | Bin
 .../images/index-screenshots/010-sign-in.png       | Bin
 .../images/index-screenshots/020-object-layout.pdn | Bin
 .../images/index-screenshots/020-object-layout.png | Bin
 .../030-declarative-business-rules.pdn             | Bin
 .../030-declarative-business-rules.png             | Bin
 .../040-imperative-business-rules.pdn              | Bin
 .../040-imperative-business-rules.png              | Bin
 .../index-screenshots/050-action-with-args.pdn     | Bin
 .../index-screenshots/050-action-with-args.png     | Bin
 .../060-action-with-args-autocomplete.pdn          | Bin
 .../060-action-with-args-autocomplete.png          | Bin
 .../images/index-screenshots/070-jdo.pdn           | Bin
 .../images/index-screenshots/070-jdo.png           | Bin
 .../images/index-screenshots/080-rest-api.pdn      | Bin
 .../images/index-screenshots/080-rest-api.png      | Bin
 .../images/index-screenshots/090-integtesting.pdn  | Bin
 .../images/index-screenshots/090-integtesting.png  | Bin
 .../modules/_to-repurpose/images/isis-favicon.png  | Bin
 .../_to-repurpose/images/isis-logo-48x48.pdn       | Bin
 .../_to-repurpose/images/isis-logo-48x48.png       | Bin
 .../_to-repurpose/images/isis-logo-568x286.pdn     | Bin
 .../_to-repurpose/images/isis-logo-568x286.png     | Bin
 .../_to-repurpose/images/todoapp/dashboard.png     | Bin
 .../_to-repurpose/images/todoapp/swagger-ui.png    | Bin
 .../_to-repurpose/images/todoapp/todoitem.png      | Bin
 .../adoc/userguide/modules/_to-repurpose}/nav.adoc |   0
 .../modules/_to-repurpose}/pages/about.adoc        |   0
 .../headless-access/BackgroundCommandExecution.png | Bin
 ...andExecutionFromBackgroundCommandServiceJdo.png | Bin
 .../action-semantics-are-you-sure.png              | Bin
 .../hints-and-tips/are-you-sure-happy-case.png     | Bin
 .../hints-and-tips/are-you-sure-sad-case.png       | Bin
 .../btb/images/hints-and-tips/are-you-sure.png     | Bin
 .../btb/images/hints-and-tips/view-model-fail.png  | Bin
 .../images/hints-and-tips/view-model-success.png   | Bin
 .../modules/btb/images/runtime/web-xml/key.png     | Bin
 .../modules/btb/images/runtime/web-xml/parts.pptx  | Bin
 .../modules/btb/images/runtime/web-xml/ro-only.png | Bin
 .../btb/images/runtime/web-xml/wicket-and-ro.png   | Bin
 .../btb/images/runtime/web-xml/wicket-only.png     | Bin
 .../adoc/userguide/modules/btb}/nav.adoc           |   0
 .../adoc}/userguide/modules/btb/pages/about.adoc   |   0
 .../userguide/modules/btb/pages/deployment.adoc    |   0
 .../modules/btb/pages/deployment/cmd-line.adoc     |   0
 .../modules/btb/pages/deployment/docker.adoc       |   0
 .../deployment/externalized-configuration.adoc     |   0
 .../modules/btb/pages/deployment/gae.adoc          |   0
 .../modules/btb/pages/deployment/jvm-flags.adoc    |   0
 .../modules/btb/pages/deployment/neo4j.adoc        |   0
 .../modules/btb/pages/deployment/tomcat.adoc       |   0
 .../modules/btb/pages/headless-access.adoc         |   0
 .../AbstractIsisSessionTemplate.adoc               |   0
 .../BackgroundCommandExecution.adoc                |   0
 .../modules/btb/pages/hints-and-tips.adoc          |   0
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |   0
 .../how-to-handle-void-and-null-results.adoc       |   0
 .../how-to-implement-a-spellchecker.adoc           |   0
 .../btb/pages/hints-and-tips/multi-tenancy.adoc    |   0
 .../btb/pages/hints-and-tips/persisted-title.adoc  |   0
 .../btb/pages/hints-and-tips/pushing-changes.adoc  |   0
 .../replacing-default-service-implementations.adoc |   0
 .../simulating-collections-of-values.adoc          |   0
 .../subclass-properties-in-tables.adoc             |   0
 .../hints-and-tips/transactions-and-errors.adoc    |   0
 .../pages/hints-and-tips/vetoing-visibility.adoc   |   0
 .../hints-and-tips/view-model-instantiation.adoc   |   0
 .../adoc}/userguide/modules/btb/pages/i18n.adoc    |   0
 .../modules/btb/pages/other-techniques.adoc        |   0
 .../modules/btb/pages/programming-model.adoc       |   0
 .../pages/programming-model/custom-validator.adoc  |   0
 .../btb/pages/programming-model/finetuning.adoc    |   0
 .../adoc}/userguide/modules/btb/pages/web-xml.adoc |   0
 .../userguide/modules/btb/partials/module-nav.adoc |   0
 .../adoc}/userguide/modules/fun/.asciidoctorconfig |   0
 .../core-concepts/Pawson-Naked-Objects-thesis.pdf  | Bin
 .../fun/attachments/object-type-taxonomy.pptx      | Bin
 .../core-concepts/philosophy/build-vs-buy.png      | Bin
 .../core-concepts/philosophy/build-vs-buy.pptx     | Bin
 .../philosophy/decoupled-applications.png          | Bin
 .../philosophy/decoupled-applications.pptx         | Bin
 .../philosophy/hexagonal-architecture-addons.png   | Bin
 .../philosophy/hexagonal-architecture.png          | Bin
 .../philosophy/hexagonal-architecture.pptx         | Bin
 .../images/programming-model/todoapp-Dashboard.png | Bin
 .../adoc/userguide/modules/fun}/nav.adoc           |   0
 .../adoc}/userguide/modules/fun/pages/about.adoc   |   0
 .../fun/pages/available-domain-services.adoc       |   0
 .../framework-provided.adoc                        |   0
 .../available-domain-services/incode-platform.adoc |   0
 .../modules/fun/pages/building-blocks.adoc         |   0
 .../modules/fun/pages/building-blocks/events.adoc  |   0
 .../building-blocks/events/domain-events.adoc      |   0
 .../building-blocks/events/lifecycle-events.adoc   |   0
 .../pages/building-blocks/events/ui-events.adoc    |   0
 .../fun/pages/building-blocks/identifiers.adoc     |   0
 .../fun/pages/building-blocks/identifiers/oid.adoc |   0
 .../identifiers/title-and-icon-and-css-class.adoc  |   0
 .../fun/pages/building-blocks/metamodel.adoc       |   0
 .../modules/fun/pages/building-blocks/modules.adoc |   0
 .../fun/pages/building-blocks/object-members.adoc  |   0
 .../building-blocks/types-of-domain-objects.adoc   |   0
 .../types-of-domain-objects/domain-entities.adoc   |   0
 .../types-of-domain-objects/domain-services.adoc   |   0
 .../types-of-domain-objects/mixins.adoc            |   0
 .../types-of-domain-objects/view-models.adoc       |   0
 .../modules/fun/pages/business-rules.adoc          |   0
 .../modules/fun/pages/business-rules/actions.adoc  |   0
 .../fun/pages/business-rules/side-effects.adoc     |   0
 .../fun/pages/business-rules/usability.adoc        |   0
 .../modules/fun/pages/business-rules/validity.adoc |   0
 .../fun/pages/business-rules/visibility.adoc       |   0
 .../userguide/modules/fun/pages/core-concepts.adoc |   0
 .../fun/pages/core-concepts/apache-isis-vs.adoc    |   0
 .../pages/core-concepts/apache-isis-vs/cqrs.adoc   |   0
 .../apache-isis-vs/event-sourcing.adoc             |   0
 .../apache-isis-vs/mvc-server-side.adoc            |   0
 .../pages/core-concepts/deployment-options.adoc    |   0
 .../fun/pages/core-concepts/philosophy.adoc        |   0
 .../fun/pages/core-concepts/philosophy/aop.adoc    |   0
 .../fun/pages/core-concepts/philosophy/dci.adoc    |   0
 .../philosophy/domain-driven-design.adoc           |   0
 .../philosophy/hexagonal-architecture.adoc         |   0
 .../core-concepts/philosophy/how-eases-ddd.adoc    |   0
 .../philosophy/naked-objects-pattern.adoc          |   0
 .../fun/pages/core-concepts/principles.adoc        |   0
 .../core-concepts/principles/build-not-buy.adoc    |   0
 .../principles/for-the-long-term.adoc              |   0
 .../core-concepts/principles/isis-itself.adoc      |   0
 .../principles/isis-itself/focuses-on-its-usp.adoc |   0
 .../isis-itself/full-stack-but-extensible.adoc     |   0
 .../core-concepts/principles/lego-blocks.adoc      |   0
 .../pages/core-concepts/principles/testable.adoc   |   0
 .../adoc}/userguide/modules/fun/pages/crud.adoc    |   0
 .../userguide/modules/fun/pages/crud/deleting.adoc |   0
 .../userguide/modules/fun/pages/crud/finding.adoc  |   0
 .../modules/fun/pages/crud/instantiating.adoc      |   0
 .../modules/fun/pages/crud/persisting.adoc         |   0
 .../userguide/modules/fun/pages/crud/updating.adoc |   0
 .../modules/fun/pages/drop-downs-and-defaults.adoc |   0
 .../modules/fun/pages/programming-model.adoc       |   0
 .../fun/pages/programming-model/actions.adoc       |   0
 .../fun/pages/programming-model/collections.adoc   |   0
 .../pages/programming-model/domain-entities.adoc   |   0
 .../pages/programming-model/domain-services.adoc   |   0
 .../domain-services/event-subscribers.adoc         |   0
 .../domain-services/initialization.adoc            |   0
 .../programming-model/domain-services/menu.adoc    |   0
 .../domain-services/organizing-services.adoc       |   0
 .../domain-services/registering.adoc               |   0
 .../domain-services/repository-and-factory.adoc    |   0
 .../domain-services/scoped-services.adoc           |   0
 .../pages/programming-model/inject-services.adoc   |   0
 .../fun/pages/programming-model/mixins.adoc        |   0
 .../mixins/contributed-action.adoc                 |   0
 .../mixins/contributed-collection.adoc             |   0
 .../mixins/contributed-property.adoc               |   0
 .../programming-model/mixins/inferred-name.adoc    |   0
 .../mixins/nested-static-classes.adoc              |   0
 .../mixins/programmatic-usage.adoc                 |   0
 .../properties-vs-parameters.adoc                  |   0
 .../fun/pages/programming-model/properties.adoc    |   0
 .../fun/pages/programming-model/view-models.adoc   |   0
 .../pages/programming-model/view-models/dto.adoc   |   0
 .../view-models/dto/dto-consumers.adoc             |   0
 .../view-models/dto/generating-xsds.adoc           |   0
 .../view-models/dto/versioning.adoc                |   0
 .../pages/programming-model/view-models/jaxb.adoc  |   0
 .../view-models/jaxb/joda-datatypes.adoc           |   0
 .../jaxb/referencing-domain-entities.adoc          |   0
 .../programming-model/view-models/non-jaxb.adoc    |   0
 .../userguide/modules/fun/pages/ui-hints.adoc      |   0
 .../fun/pages/ui-hints/action-icons-and-css.adoc   |   0
 .../fun/pages/ui-hints/eager-rendering.adoc        |   0
 .../modules/fun/pages/ui-hints/layout.adoc         |   0
 .../fun/pages/ui-hints/names-and-descriptions.adoc |   0
 .../pages/ui-hints/object-titles-and-icons.adoc    |   0
 .../userguide/modules/fun/partials/module-nav.adoc |   0
 {antora/components/core => core/adoc}/antora.yml   |   0
 .../archdesign => core/adoc/modules/ROOT}/nav.adoc |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../attachments/modules-dependencies.pptx          | Bin
 .../archdesign/images/modules-dependencies.png     | Bin
 .../ROOT => core/adoc/modules/archdesign}/nav.adoc |   0
 .../adoc}/modules/archdesign/pages/about.adoc      |   0
 .../archdesign/pages/concurrent-task-list.adoc     |   0
 .../modules/archdesign/pages/maven-modules.adoc    |   0
 .../adoc}/modules/archdesign/pages/metamodel.adoc  |   0
 .../adoc}/modules/archdesign/pages/webmodules.adoc |   0
 .../modules/archdesign/partials/module-nav.adoc    |   0
 .../incubator => incubator/adoc}/antora.yml        |   0
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../components/legacy => legacy/adoc}/antora.yml   |   0
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../mappings => mappings/adoc}/antora.yml          |   0
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../security => security/adoc}/antora.yml          |   0
 .../ROOT/attachments/security-apis-impl.pptx       | Bin
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../domain-services-api-for-applications.adoc      |   0
 .../modules/ROOT/pages/usage-by-isis-viewers.adoc  |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../modules/ROOT/partials/module-nav-end.adoc      |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../subdomains => subdomains/adoc}/antora.yml      |   0
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 .../valuetypes => valuetypes/adoc}/antora.yml      |   0
 .../adoc}/modules/ROOT/nav.adoc                    |   0
 .../adoc}/modules/ROOT/pages/about.adoc            |   0
 .../adoc}/modules/ROOT/partials/component-nav.adoc |   0
 .../adoc}/modules/ROOT/partials/module-nav.adoc    |   0
 589 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/antora/components/_component-template/antora.yml b/antora/_component-template/antora.yml
similarity index 100%
rename from antora/components/_component-template/antora.yml
rename to antora/_component-template/antora.yml
diff --git a/antora/components/_component-template/modules/ROOT/nav.adoc b/antora/_component-template/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/_component-template/modules/ROOT/nav.adoc
rename to antora/_component-template/modules/ROOT/nav.adoc
diff --git a/antora/components/_component-template/modules/ROOT/pages/about.adoc b/antora/_component-template/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/_component-template/modules/ROOT/pages/about.adoc
rename to antora/_component-template/modules/ROOT/pages/about.adoc
diff --git a/antora/components/userguide/modules/_to-repurpose/images/.gitkeep b/antora/_component-template/modules/_module-template/attachments/.gitkeep
similarity index 100%
copy from antora/components/userguide/modules/_to-repurpose/images/.gitkeep
copy to antora/_component-template/modules/_module-template/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/examples/.gitkeep b/antora/_component-template/modules/_module-template/examples/.gitkeep
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/examples/.gitkeep
rename to antora/_component-template/modules/_module-template/examples/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/attachments/.gitkeep b/antora/_component-template/modules/_module-template/images/.gitkeep
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/attachments/.gitkeep
rename to antora/_component-template/modules/_module-template/images/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/nav.adoc b/antora/_component-template/modules/_module-template/nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/nav.adoc
rename to antora/_component-template/modules/_module-template/nav.adoc
diff --git a/antora/components/userguide/modules/_to-repurpose/pages/about.adoc b/antora/_component-template/modules/_module-template/pages/about.adoc
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/pages/about.adoc
rename to antora/_component-template/modules/_module-template/pages/about.adoc
diff --git a/antora/components/toc/modules/ROOT/examples/.gitkeep b/antora/_component-template/modules/_module-template/partials/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/ROOT/examples/.gitkeep
rename to antora/_component-template/modules/_module-template/partials/.gitkeep
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index f04f9a4..b8ba4fa 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/core # core
-      branches: HEAD
 
 # core
     - url: .
+      start_path: core/adoc # core
+      branches: HEAD
+    - url: .
       start_path: core/codegen-bytebuddy/src/main/adoc # core
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 7c35b3a..b77cc2b 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 # extensions
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index da0f145..60f1481 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/incubator # incubator
-      branches: HEAD
 
 # incubator
     - url: .
+      start_path: incubator/adoc # incubator
+      branches: HEAD
+    - url: .
       start_path: incubator/core/model/src/main/adoc # incubator
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 97e1394..930161a 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/legacy # legacy
-      branches: HEAD
 
 # legacy
     - url: .
+      start_path: legacy/adoc # legacy
+      branches: HEAD
+    - url: .
       start_path: legacy/extensions/core/applib/src/main/adoc # legacy
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index c3988bf..7c53488 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/mappings # mappings
-      branches: HEAD
 
 # mappings
     - url: .
+      start_path: mappings/adoc # mappings
+      branches: HEAD
+    - url: .
       start_path: mappings/jaxrsclient/adoc # mappings
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-pjdo.yml b/antora/playbooks/site-pjdo.yml
index 1ada2f3..ab4e2db 100644
--- a/antora/playbooks/site-pjdo.yml
+++ b/antora/playbooks/site-pjdo.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 # core
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index 8663d0e..dc1ee5b 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/refguide # refguide
-      branches: HEAD
 
 # api
     - url: .
+      start_path: api/adoc/refguide # refguide
+      branches: HEAD
+    - url: .
       start_path: api/applib/src/main/adoc # refguide
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index fff06ad..b20ab99 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -8,12 +8,9 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/security # security
-      branches: HEAD
 
 # core
     - url: .
@@ -30,6 +27,9 @@ content:
 
 # security
     - url: .
+      start_path: security/adoc # security
+      branches: HEAD
+    - url: .
       start_path: security/bypass/src/main/adoc # security
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-starters.yml b/antora/playbooks/site-starters.yml
index 276e313..d21da76 100644
--- a/antora/playbooks/site-starters.yml
+++ b/antora/playbooks/site-starters.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 # mavendeps
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 41ca63e..0567174 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -8,15 +8,15 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/subdomains # subdomains
-      branches: HEAD
 
 # subdomains
     - url: .
+      start_path: subdomains/adoc # subdomains
+      branches: HEAD
+    - url: .
       start_path: subdomains/base/adoc # subdomains
       branches: HEAD
     - url: .
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 62fd294..9e3e450 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-toc.yml b/antora/playbooks/site-toc.yml
index eb65104..673b85d 100644
--- a/antora/playbooks/site-toc.yml
+++ b/antora/playbooks/site-toc.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index aabcc9f..fcfad06 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -6,12 +6,14 @@ site:
 content:
   sources:
 
-# antora/components
+# antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
+
+# api
     - url: .
-      start_path: antora/components/userguide # userguide
+      start_path: api/adoc/userguide # userguide
       branches: HEAD
 
 # extensions
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 633d5d1..7f172c0 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -8,22 +8,22 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
-    - url: .
-      start_path: antora/components/valuetypes # valuetypes
-      branches: HEAD
 
 # valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/adoc # vw
+      start_path: valuetypes/adoc # valuetypes
+      branches: HEAD
+    - url: .
+      start_path: valuetypes/asciidoc/adoc # valuetypes
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/adoc # vw
+      start_path: valuetypes/markdown/adoc # valuetypes
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/adoc # vw
+      start_path: valuetypes/sse/adoc # valuetypes
       branches: HEAD
 
 ui:
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 1225faa..eac36fa 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 # core
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index 4a5977e..ba7bf23 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -8,7 +8,7 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
 # core
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index b4ca06c..1e69529 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -8,38 +8,17 @@ content:
 
 # antora
     - url: .
-      start_path: antora/components/toc # toc
+      start_path: antora/toc # toc
       branches: HEAD
 
+
+# api
     - url: .
-      start_path: antora/components/core # core
-      branches: HEAD
-    - url: .
-      start_path: antora/components/incubator # incubator
-      branches: HEAD
-    - url: .
-      start_path: antora/components/legacy # legacy
-      branches: HEAD
-    - url: .
-      start_path: antora/components/mappings # mappings
-      branches: HEAD
-    - url: .
-      start_path: antora/components/refguide # refguide
-      branches: HEAD
-    - url: .
-      start_path: antora/components/security # security
-      branches: HEAD
-    - url: .
-      start_path: antora/components/subdomains # subdomains
-      branches: HEAD
-    - url: .
-      start_path: antora/components/userguide # userguide
+      start_path: api/adoc/refguide # refguide
       branches: HEAD
     - url: .
-      start_path: antora/components/valuetypes # valuetypes
+      start_path: api/adoc/userguide # userguide
       branches: HEAD
-
-# api
     - url: .
       start_path: api/applib/src/main/adoc # refguide
       branches: HEAD
@@ -49,6 +28,9 @@ content:
 
 # core
     - url: .
+      start_path: core/adoc # core
+      branches: HEAD
+    - url: .
       start_path: core/codegen-bytebuddy/src/main/adoc # core
       branches: HEAD
     - url: .
@@ -127,6 +109,9 @@ content:
 
 # incubator
     - url: .
+      start_path: incubator/adoc # incubator
+      branches: HEAD
+    - url: .
       start_path: incubator/core/model/src/main/adoc # incubator
       branches: HEAD
     - url: .
@@ -135,6 +120,9 @@ content:
 
 # legacy
     - url: .
+      start_path: legacy/adoc # legacy
+      branches: HEAD
+    - url: .
       start_path: legacy/extensions/core/applib/src/main/adoc # legacy
       branches: HEAD
     - url: .
@@ -152,6 +140,9 @@ content:
 
 # mappings
     - url: .
+      start_path: mappings/adoc # mappings
+      branches: HEAD
+    - url: .
       start_path: mappings/jaxrsclient/adoc # mappings
       branches: HEAD
     - url: .
@@ -171,6 +162,9 @@ content:
 
 # security
     - url: .
+      start_path: security/adoc # security
+      branches: HEAD
+    - url: .
       start_path: security/bypass/src/main/adoc # security
       branches: HEAD
     - url: .
@@ -187,6 +181,9 @@ content:
 
 # subdomains
     - url: .
+      start_path: subdomains/adoc # subdomains
+      branches: HEAD
+    - url: .
       start_path: subdomains/base/adoc # subdomains
       branches: HEAD
     - url: .
@@ -242,13 +239,16 @@ content:
 
 # valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/adoc # vw
+      start_path: valuetypes/adoc # valuetypes
+      branches: HEAD
+    - url: .
+      start_path: valuetypes/asciidoc/adoc # valuetypes
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/adoc # vw
+      start_path: valuetypes/markdown/adoc # valuetypes
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/adoc # vw
+      start_path: valuetypes/sse/adoc # valuetypes
       branches: HEAD
 
 ui:
diff --git a/antora/components/toc/antora.yml b/antora/toc/antora.yml
similarity index 100%
rename from antora/components/toc/antora.yml
rename to antora/toc/antora.yml
diff --git a/antora/components/toc/modules/ROOT/attachments/.gitkeep b/antora/toc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/ROOT/attachments/.gitkeep
rename to antora/toc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/_component-template/modules/_module-template/images/.gitkeep b/antora/toc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/_component-template/modules/_module-template/images/.gitkeep
rename to antora/toc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg b/antora/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
rename to antora/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
diff --git a/antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg b/antora/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
rename to antora/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
diff --git a/antora/components/toc/modules/ROOT/images/more-thanks/ecp.png b/antora/toc/modules/ROOT/images/more-thanks/ecp.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
rename to antora/toc/modules/ROOT/images/more-thanks/ecp.png
diff --git a/antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png b/antora/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
rename to antora/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
diff --git a/antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png b/antora/toc/modules/ROOT/images/more-thanks/ej-technologies.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
rename to antora/toc/modules/ROOT/images/more-thanks/ej-technologies.png
diff --git a/antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png b/antora/toc/modules/ROOT/images/more-thanks/icons8-logo.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
rename to antora/toc/modules/ROOT/images/more-thanks/icons8-logo.png
diff --git a/antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png b/antora/toc/modules/ROOT/images/more-thanks/s101_170.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
rename to antora/toc/modules/ROOT/images/more-thanks/s101_170.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/010.png b/antora/toc/modules/ROOT/images/support/slack/010.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/010.png
rename to antora/toc/modules/ROOT/images/support/slack/010.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/020.png b/antora/toc/modules/ROOT/images/support/slack/020.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/020.png
rename to antora/toc/modules/ROOT/images/support/slack/020.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/030.png b/antora/toc/modules/ROOT/images/support/slack/030.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/030.png
rename to antora/toc/modules/ROOT/images/support/slack/030.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/040.png b/antora/toc/modules/ROOT/images/support/slack/040.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/040.png
rename to antora/toc/modules/ROOT/images/support/slack/040.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/050.png b/antora/toc/modules/ROOT/images/support/slack/050.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/050.png
rename to antora/toc/modules/ROOT/images/support/slack/050.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/060.png b/antora/toc/modules/ROOT/images/support/slack/060.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/060.png
rename to antora/toc/modules/ROOT/images/support/slack/060.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/070.png b/antora/toc/modules/ROOT/images/support/slack/070.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/070.png
rename to antora/toc/modules/ROOT/images/support/slack/070.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/080.png b/antora/toc/modules/ROOT/images/support/slack/080.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/080.png
rename to antora/toc/modules/ROOT/images/support/slack/080.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/090.png b/antora/toc/modules/ROOT/images/support/slack/090.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/090.png
rename to antora/toc/modules/ROOT/images/support/slack/090.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/100.png b/antora/toc/modules/ROOT/images/support/slack/100.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/100.png
rename to antora/toc/modules/ROOT/images/support/slack/100.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/110.png b/antora/toc/modules/ROOT/images/support/slack/110.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/110.png
rename to antora/toc/modules/ROOT/images/support/slack/110.png
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf b/antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
rename to antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf b/antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
rename to antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
diff --git a/antora/components/toc/modules/ROOT/images/tv_show-25.png b/antora/toc/modules/ROOT/images/tv_show-25.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/tv_show-25.png
rename to antora/toc/modules/ROOT/images/tv_show-25.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
diff --git a/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png b/antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
rename to antora/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/toc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/nav.adoc
rename to antora/toc/modules/ROOT/nav.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/toc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/about.adoc
rename to antora/toc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc b/antora/toc/modules/ROOT/pages/downloads/how-to.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
rename to antora/toc/modules/ROOT/pages/downloads/how-to.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc b/antora/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
rename to antora/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc b/antora/toc/modules/ROOT/pages/going-deeper/books.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
rename to antora/toc/modules/ROOT/pages/going-deeper/books.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc b/antora/toc/modules/ROOT/pages/landing-page/catalogs.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/catalogs.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/components.adoc b/antora/toc/modules/ROOT/pages/landing-page/components.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/components.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/components.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc b/antora/toc/modules/ROOT/pages/landing-page/guides.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/guides.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc b/antora/toc/modules/ROOT/pages/landing-page/internal.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/internal.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc b/antora/toc/modules/ROOT/pages/landing-page/releases.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/releases.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/support.adoc b/antora/toc/modules/ROOT/pages/landing-page/support.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
rename to antora/toc/modules/ROOT/pages/landing-page/support.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc b/antora/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
rename to antora/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/support/mailing-list.adoc b/antora/toc/modules/ROOT/pages/support/mailing-list.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/support/mailing-list.adoc
rename to antora/toc/modules/ROOT/pages/support/mailing-list.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/support/slack-channel.adoc b/antora/toc/modules/ROOT/pages/support/slack-channel.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/support/slack-channel.adoc
rename to antora/toc/modules/ROOT/pages/support/slack-channel.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc b/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
rename to antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
diff --git a/antora/components/toc/modules/ROOT/partials/component-nav.adoc b/antora/toc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/partials/component-nav.adoc
rename to antora/toc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/toc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/partials/module-nav.adoc
rename to antora/toc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/toc/modules/comguide/images/committers/github-pr-history.png b/antora/toc/modules/comguide/images/committers/github-pr-history.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/committers/github-pr-history.png
rename to antora/toc/modules/comguide/images/committers/github-pr-history.png
diff --git a/antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png b/antora/toc/modules/comguide/images/docker/020-docker-nat-public.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png
rename to antora/toc/modules/comguide/images/docker/020-docker-nat-public.png
diff --git a/antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png b/antora/toc/modules/comguide/images/docker/022-local-security-policy.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png
rename to antora/toc/modules/comguide/images/docker/022-local-security-policy.png
diff --git a/antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png b/antora/toc/modules/comguide/images/docker/024-unidentified-are-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png
rename to antora/toc/modules/comguide/images/docker/024-unidentified-are-private.png
diff --git a/antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png b/antora/toc/modules/comguide/images/docker/026-docker-nat-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png
rename to antora/toc/modules/comguide/images/docker/026-docker-nat-private.png
diff --git a/antora/components/toc/modules/comguide/images/docker/docker-daemon.png b/antora/toc/modules/comguide/images/docker/docker-daemon.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/docker/docker-daemon.png
rename to antora/toc/modules/comguide/images/docker/docker-daemon.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png b/antora/toc/modules/comguide/images/release-process/jira-create-release-notes.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png
rename to antora/toc/modules/comguide/images/release-process/jira-create-release-notes.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png b/antora/toc/modules/comguide/images/release-process/nexus-release-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png
rename to antora/toc/modules/comguide/images/release-process/nexus-release-1.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-0.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-0.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-1.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-2.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-2.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-2a.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-2a.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-3.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-3.png
diff --git a/antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png b/antora/toc/modules/comguide/images/release-process/nexus-staging-4.png
similarity index 100%
rename from antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png
rename to antora/toc/modules/comguide/images/release-process/nexus-staging-4.png
diff --git a/antora/components/toc/modules/relnotes/nav.adoc b/antora/toc/modules/comguide/nav.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/nav.adoc
rename to antora/toc/modules/comguide/nav.adoc
diff --git a/antora/components/toc/modules/comguide/pages/about.adoc b/antora/toc/modules/comguide/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/about.adoc
rename to antora/toc/modules/comguide/pages/about.adoc
diff --git a/antora/components/toc/modules/comguide/pages/antora-publish-procedure.adoc b/antora/toc/modules/comguide/pages/antora-publish-procedure.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/antora-publish-procedure.adoc
rename to antora/toc/modules/comguide/pages/antora-publish-procedure.adoc
diff --git a/antora/components/toc/modules/comguide/pages/applying-patches.adoc b/antora/toc/modules/comguide/pages/applying-patches.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/applying-patches.adoc
rename to antora/toc/modules/comguide/pages/applying-patches.adoc
diff --git a/antora/components/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/cutting-a-release.adoc
rename to antora/toc/modules/comguide/pages/cutting-a-release.adoc
diff --git a/antora/components/toc/modules/comguide/pages/key-generation.adoc b/antora/toc/modules/comguide/pages/key-generation.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/key-generation.adoc
rename to antora/toc/modules/comguide/pages/key-generation.adoc
diff --git a/antora/components/toc/modules/comguide/pages/merging-a-pull-request.adoc b/antora/toc/modules/comguide/pages/merging-a-pull-request.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/merging-a-pull-request.adoc
rename to antora/toc/modules/comguide/pages/merging-a-pull-request.adoc
diff --git a/antora/components/toc/modules/comguide/pages/pmc-notes.adoc b/antora/toc/modules/comguide/pages/pmc-notes.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/pmc-notes.adoc
rename to antora/toc/modules/comguide/pages/pmc-notes.adoc
diff --git a/antora/components/toc/modules/comguide/pages/policies.adoc b/antora/toc/modules/comguide/pages/policies.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/policies.adoc
rename to antora/toc/modules/comguide/pages/policies.adoc
diff --git a/antora/components/toc/modules/comguide/pages/policies/git-policy.adoc b/antora/toc/modules/comguide/pages/policies/git-policy.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/policies/git-policy.adoc
rename to antora/toc/modules/comguide/pages/policies/git-policy.adoc
diff --git a/antora/components/toc/modules/comguide/pages/policies/versioning-policy.adoc b/antora/toc/modules/comguide/pages/policies/versioning-policy.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/policies/versioning-policy.adoc
rename to antora/toc/modules/comguide/pages/policies/versioning-policy.adoc
diff --git a/antora/components/toc/modules/comguide/pages/post-release-successful.adoc b/antora/toc/modules/comguide/pages/post-release-successful.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/post-release-successful.adoc
rename to antora/toc/modules/comguide/pages/post-release-successful.adoc
diff --git a/antora/components/toc/modules/comguide/pages/post-release-unsuccessful.adoc b/antora/toc/modules/comguide/pages/post-release-unsuccessful.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/post-release-unsuccessful.adoc
rename to antora/toc/modules/comguide/pages/post-release-unsuccessful.adoc
diff --git a/antora/components/toc/modules/comguide/pages/release-process-for-interim-releases.adoc b/antora/toc/modules/comguide/pages/release-process-for-interim-releases.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/release-process-for-interim-releases.adoc
rename to antora/toc/modules/comguide/pages/release-process-for-interim-releases.adoc
diff --git a/antora/components/toc/modules/comguide/pages/release-process-for-snapshots.adoc b/antora/toc/modules/comguide/pages/release-process-for-snapshots.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/release-process-for-snapshots.adoc
rename to antora/toc/modules/comguide/pages/release-process-for-snapshots.adoc
diff --git a/antora/components/toc/modules/comguide/pages/release-process-prereqs.adoc b/antora/toc/modules/comguide/pages/release-process-prereqs.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/release-process-prereqs.adoc
rename to antora/toc/modules/comguide/pages/release-process-prereqs.adoc
diff --git a/antora/components/toc/modules/comguide/pages/verifying-releases.adoc b/antora/toc/modules/comguide/pages/verifying-releases.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/pages/verifying-releases.adoc
rename to antora/toc/modules/comguide/pages/verifying-releases.adoc
diff --git a/antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf b/antora/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
rename to antora/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
diff --git a/antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf b/antora/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
rename to antora/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml b/antora/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
rename to antora/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml b/antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
rename to antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml b/antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
rename to antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml b/antora/toc/modules/devguide/attachments/eclipse/isis-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml
rename to antora/toc/modules/devguide/attachments/eclipse/isis-templates.xml
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder b/antora/toc/modules/devguide/attachments/eclipse/isis.importorder
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder
rename to antora/toc/modules/devguide/attachments/eclipse/isis.importorder
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml b/antora/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
rename to antora/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
diff --git a/antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml b/antora/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
rename to antora/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
diff --git a/antora/components/toc/modules/devguide/attachments/intellij/.gitignore b/antora/toc/modules/devguide/attachments/intellij/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/intellij/.gitignore
rename to antora/toc/modules/devguide/attachments/intellij/.gitignore
diff --git a/antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar b/antora/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
rename to antora/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
diff --git a/antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore b/antora/toc/modules/devguide/attachments/intellij/other/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore
rename to antora/toc/modules/devguide/attachments/intellij/other/.gitignore
diff --git a/antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar b/antora/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
rename to antora/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
diff --git a/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx b/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
rename to antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
diff --git a/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf b/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
rename to antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
diff --git a/antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png b/antora/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
rename to antora/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
diff --git a/antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png b/antora/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
rename to antora/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
diff --git a/antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png b/antora/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
rename to antora/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
diff --git a/antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png b/antora/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
rename to antora/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
diff --git a/antora/components/toc/modules/devguide/images/contributing/git-workflow.png b/antora/toc/modules/devguide/images/contributing/git-workflow.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/contributing/git-workflow.png
rename to antora/toc/modules/devguide/images/contributing/git-workflow.png
diff --git a/antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx b/antora/toc/modules/devguide/images/contributing/git-workflow.pptx
similarity index 100%
rename from antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx
rename to antora/toc/modules/devguide/images/contributing/git-workflow.pptx
diff --git a/antora/components/toc/modules/devguide/images/contributing/github-cloning.png b/antora/toc/modules/devguide/images/contributing/github-cloning.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/contributing/github-cloning.png
rename to antora/toc/modules/devguide/images/contributing/github-cloning.png
diff --git a/antora/components/toc/modules/devguide/images/contributing/github-forking.png b/antora/toc/modules/devguide/images/contributing/github-forking.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/contributing/github-forking.png
rename to antora/toc/modules/devguide/images/contributing/github-forking.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png b/antora/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
rename to antora/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png b/antora/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png b/antora/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png b/antora/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png b/antora/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png b/antora/toc/modules/devguide/images/eclipse/eclipse-120-console.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-120-console.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png b/antora/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png b/antora/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png b/antora/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
rename to antora/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
rename to antora/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
rename to antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png b/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
rename to antora/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png b/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
rename to antora/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png b/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
rename to antora/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png b/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
rename to antora/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png b/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
rename to antora/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png b/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
rename to antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png b/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
rename to antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png b/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
rename to antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
rename to antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png b/antora/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
rename to antora/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png b/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
rename to antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png b/antora/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
rename to antora/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
rename to antora/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png b/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
rename to antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
rename to antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
rename to antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
rename to antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
rename to antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
rename to antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png b/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
rename to antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png b/antora/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
rename to antora/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png b/antora/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
rename to antora/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
diff --git a/antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png b/antora/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
rename to antora/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
diff --git a/antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png b/antora/toc/modules/devguide/images/layouts/estatio-Lease.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png
rename to antora/toc/modules/devguide/images/layouts/estatio-Lease.png
diff --git a/antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png b/antora/toc/modules/devguide/images/resources/IsisCheatSheet.png
similarity index 100%
rename from antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png
rename to antora/toc/modules/devguide/images/resources/IsisCheatSheet.png
diff --git a/antora/components/toc/modules/mignotes/nav.adoc b/antora/toc/modules/devguide/nav.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/nav.adoc
rename to antora/toc/modules/devguide/nav.adoc
diff --git a/antora/components/toc/modules/devguide/pages/about.adoc b/antora/toc/modules/devguide/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/about.adoc
rename to antora/toc/modules/devguide/pages/about.adoc
diff --git a/antora/components/toc/modules/devguide/pages/agilej.adoc b/antora/toc/modules/devguide/pages/agilej.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/agilej.adoc
rename to antora/toc/modules/devguide/pages/agilej.adoc
diff --git a/antora/components/toc/modules/devguide/pages/asciidoc-syntax.adoc b/antora/toc/modules/devguide/pages/asciidoc-syntax.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/asciidoc-syntax.adoc
rename to antora/toc/modules/devguide/pages/asciidoc-syntax.adoc
diff --git a/antora/components/toc/modules/devguide/pages/building-apache-isis.adoc b/antora/toc/modules/devguide/pages/building-apache-isis.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/building-apache-isis.adoc
rename to antora/toc/modules/devguide/pages/building-apache-isis.adoc
diff --git a/antora/components/toc/modules/devguide/pages/building-docs-and-website.adoc b/antora/toc/modules/devguide/pages/building-docs-and-website.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/building-docs-and-website.adoc
rename to antora/toc/modules/devguide/pages/building-docs-and-website.adoc
diff --git a/antora/components/toc/modules/devguide/pages/cmd-line.adoc b/antora/toc/modules/devguide/pages/cmd-line.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/cmd-line.adoc
rename to antora/toc/modules/devguide/pages/cmd-line.adoc
diff --git a/antora/components/toc/modules/devguide/pages/contributing.adoc b/antora/toc/modules/devguide/pages/contributing.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/contributing.adoc
rename to antora/toc/modules/devguide/pages/contributing.adoc
diff --git a/antora/components/toc/modules/devguide/pages/git-cookbook.adoc b/antora/toc/modules/devguide/pages/git-cookbook.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/git-cookbook.adoc
rename to antora/toc/modules/devguide/pages/git-cookbook.adoc
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips.adoc b/antora/toc/modules/devguide/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/hints-and-tips.adoc
rename to antora/toc/modules/devguide/pages/hints-and-tips.adoc
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc b/antora/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
rename to antora/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc b/antora/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
rename to antora/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc b/antora/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc
rename to antora/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc b/antora/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
rename to antora/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
diff --git a/antora/components/toc/modules/devguide/pages/ide.adoc b/antora/toc/modules/devguide/pages/ide.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/ide.adoc
rename to antora/toc/modules/devguide/pages/ide.adoc
diff --git a/antora/components/toc/modules/devguide/pages/ide/eclipse.adoc b/antora/toc/modules/devguide/pages/ide/eclipse.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/ide/eclipse.adoc
rename to antora/toc/modules/devguide/pages/ide/eclipse.adoc
diff --git a/antora/components/toc/modules/devguide/pages/ide/intellij.adoc b/antora/toc/modules/devguide/pages/ide/intellij.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/ide/intellij.adoc
rename to antora/toc/modules/devguide/pages/ide/intellij.adoc
diff --git a/antora/components/toc/modules/devguide/pages/project-lombok.adoc b/antora/toc/modules/devguide/pages/project-lombok.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/project-lombok.adoc
rename to antora/toc/modules/devguide/pages/project-lombok.adoc
diff --git a/antora/components/toc/modules/devguide/pages/resources/cheat-sheet.adoc b/antora/toc/modules/devguide/pages/resources/cheat-sheet.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/resources/cheat-sheet.adoc
rename to antora/toc/modules/devguide/pages/resources/cheat-sheet.adoc
diff --git a/antora/components/toc/modules/devguide/pages/resources/icons.adoc b/antora/toc/modules/devguide/pages/resources/icons.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/resources/icons.adoc
rename to antora/toc/modules/devguide/pages/resources/icons.adoc
diff --git a/antora/components/toc/modules/devguide/pages/working-with-many-repos.adoc b/antora/toc/modules/devguide/pages/working-with-many-repos.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/working-with-many-repos.adoc
rename to antora/toc/modules/devguide/pages/working-with-many-repos.adoc
diff --git a/antora/components/toc/modules/devguide/partials/x.sh b/antora/toc/modules/devguide/partials/x.sh
similarity index 100%
rename from antora/components/toc/modules/devguide/partials/x.sh
rename to antora/toc/modules/devguide/partials/x.sh
diff --git a/antora/components/toc/modules/devguide/nav.adoc b/antora/toc/modules/mignotes/nav.adoc
similarity index 100%
rename from antora/components/toc/modules/devguide/nav.adoc
rename to antora/toc/modules/mignotes/nav.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/about.adoc b/antora/toc/modules/mignotes/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/about.adoc
rename to antora/toc/modules/mignotes/pages/about.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc b/antora/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
rename to antora/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc
similarity index 100%
rename from antora/components/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc
rename to antora/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc
diff --git a/antora/components/toc/modules/comguide/nav.adoc b/antora/toc/modules/relnotes/nav.adoc
similarity index 100%
rename from antora/components/toc/modules/comguide/nav.adoc
rename to antora/toc/modules/relnotes/nav.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/about.adoc b/antora/toc/modules/relnotes/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/about.adoc
rename to antora/toc/modules/relnotes/pages/about.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.0.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.0.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.0.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.0.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.0.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.0.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.0.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.0.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.1.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.1.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.1.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.1.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.10.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.10.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.10.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.10.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.11.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.11.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.11.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.11.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.11.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.11.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.11.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.11.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.12.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.12.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.12.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.12.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.12.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.12.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.12.2.adoc b/antora/toc/modules/relnotes/pages/rn-1.12.2.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.12.2.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.12.2.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.13.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.13.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.13.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.13.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.13.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.13.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.13.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.13.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.13.2.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.13.2.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.13.2.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.13.2.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.13.2.adoc b/antora/toc/modules/relnotes/pages/rn-1.13.2.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.13.2.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.13.2.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.14.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.14.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.14.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.14.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.15.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.15.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.15.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.15.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.15.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.15.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.15.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.15.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.16.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.16.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.16.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.16.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.16.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.16.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.16.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.16.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.16.2.adoc b/antora/toc/modules/relnotes/pages/rn-1.16.2.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.16.2.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.16.2.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.17.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.17.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.17.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.17.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.2.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.2.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.2.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.2.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.3.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.3.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.3.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.3.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.3.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.3.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.3.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.3.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.4.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.4.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.4.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.4.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.4.1.adoc b/antora/toc/modules/relnotes/pages/rn-1.4.1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.4.1.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.4.1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.5.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.5.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.5.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.5.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.6.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.6.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.6.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.6.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.7.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.7.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.7.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.7.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.8.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.8.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.8.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.8.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.9.0.adoc b/antora/toc/modules/relnotes/pages/rn-1.9.0.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-1.9.0.adoc
rename to antora/toc/modules/relnotes/pages/rn-1.9.0.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc b/antora/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc
rename to antora/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc
diff --git a/antora/components/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc b/antora/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc
similarity index 100%
rename from antora/components/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc
rename to antora/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc
diff --git a/antora/components/refguide/antora.yml b/api/adoc/refguide/antora.yml
similarity index 100%
rename from antora/components/refguide/antora.yml
rename to api/adoc/refguide/antora.yml
diff --git a/antora/components/refguide/modules/ROOT/nav.adoc b/api/adoc/refguide/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/refguide/modules/ROOT/nav.adoc
rename to api/adoc/refguide/modules/ROOT/nav.adoc
diff --git a/antora/components/refguide/modules/ROOT/pages/about.adoc b/api/adoc/refguide/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/refguide/modules/ROOT/pages/about.adoc
rename to api/adoc/refguide/modules/ROOT/pages/about.adoc
diff --git a/antora/components/refguide/modules/ROOT/partials/component-nav.adoc b/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/refguide/modules/ROOT/partials/component-nav.adoc
rename to api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/refguide/modules/ROOT/partials/module-nav.adoc b/api/adoc/refguide/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/refguide/modules/ROOT/partials/module-nav.adoc
rename to api/adoc/refguide/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/userguide/antora.yml b/api/adoc/userguide/antora.yml
similarity index 100%
rename from antora/components/userguide/antora.yml
rename to api/adoc/userguide/antora.yml
diff --git a/antora/components/userguide/modules/ROOT/nav.adoc b/api/adoc/userguide/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/ROOT/nav.adoc
rename to api/adoc/userguide/modules/ROOT/nav.adoc
diff --git a/antora/components/userguide/modules/ROOT/pages/about.adoc b/api/adoc/userguide/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/userguide/modules/ROOT/pages/about.adoc
rename to api/adoc/userguide/modules/ROOT/pages/about.adoc
diff --git a/antora/components/userguide/modules/ROOT/partials/component-nav.adoc b/api/adoc/userguide/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/ROOT/partials/component-nav.adoc
rename to api/adoc/userguide/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/userguide/modules/ROOT/partials/module-nav.adoc b/api/adoc/userguide/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/ROOT/partials/module-nav.adoc
rename to api/adoc/userguide/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/_component-template/modules/_module-template/examples/.gitkeep b/api/adoc/userguide/modules/_to-repurpose/attachments/.gitkeep
similarity index 100%
rename from antora/components/_component-template/modules/_module-template/examples/.gitkeep
rename to api/adoc/userguide/modules/_to-repurpose/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx b/api/adoc/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
rename to api/adoc/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
diff --git a/antora/components/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx b/api/adoc/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
rename to api/adoc/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
diff --git a/antora/components/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx b/api/adoc/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
rename to api/adoc/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
diff --git a/antora/components/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png b/api/adoc/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
rename to api/adoc/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
diff --git a/antora/components/_component-template/modules/_module-template/attachments/.gitkeep b/api/adoc/userguide/modules/_to-repurpose/examples/.gitkeep
similarity index 100%
rename from antora/components/_component-template/modules/_module-template/attachments/.gitkeep
rename to api/adoc/userguide/modules/_to-repurpose/examples/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/images/.gitkeep b/api/adoc/userguide/modules/_to-repurpose/images/.gitkeep
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/.gitkeep
rename to api/adoc/userguide/modules/_to-repurpose/images/.gitkeep
diff --git a/antora/components/userguide/modules/_to-repurpose/images/PDF-50.png b/api/adoc/userguide/modules/_to-repurpose/images/PDF-50.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/PDF-50.png
rename to api/adoc/userguide/modules/_to-repurpose/images/PDF-50.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png b/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
rename to api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/isis-favicon.png b/api/adoc/userguide/modules/_to-repurpose/images/isis-favicon.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/isis-favicon.png
rename to api/adoc/userguide/modules/_to-repurpose/images/isis-favicon.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn b/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.png b/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
rename to api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn b/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
rename to api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
diff --git a/antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.png b/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
rename to api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/todoapp/dashboard.png b/api/adoc/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
rename to api/adoc/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png b/api/adoc/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
rename to api/adoc/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
diff --git a/antora/components/userguide/modules/_to-repurpose/images/todoapp/todoitem.png b/api/adoc/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
similarity index 100%
rename from antora/components/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
rename to api/adoc/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
diff --git a/antora/components/_component-template/modules/_module-template/nav.adoc b/api/adoc/userguide/modules/_to-repurpose/nav.adoc
similarity index 100%
rename from antora/components/_component-template/modules/_module-template/nav.adoc
rename to api/adoc/userguide/modules/_to-repurpose/nav.adoc
diff --git a/antora/components/_component-template/modules/_module-template/pages/about.adoc b/api/adoc/userguide/modules/_to-repurpose/pages/about.adoc
similarity index 100%
rename from antora/components/_component-template/modules/_module-template/pages/about.adoc
rename to api/adoc/userguide/modules/_to-repurpose/pages/about.adoc
diff --git a/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png b/api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
rename to api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
diff --git a/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
diff --git a/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png b/api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png
rename to api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-success.png
diff --git a/antora/components/userguide/modules/btb/images/runtime/web-xml/key.png b/api/adoc/userguide/modules/btb/images/runtime/web-xml/key.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
rename to api/adoc/userguide/modules/btb/images/runtime/web-xml/key.png
diff --git a/antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx b/api/adoc/userguide/modules/btb/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
rename to api/adoc/userguide/modules/btb/images/runtime/web-xml/parts.pptx
diff --git a/antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png b/api/adoc/userguide/modules/btb/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
rename to api/adoc/userguide/modules/btb/images/runtime/web-xml/ro-only.png
diff --git a/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png b/api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
rename to api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
diff --git a/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png b/api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
rename to api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
diff --git a/antora/components/userguide/modules/fun/nav.adoc b/api/adoc/userguide/modules/btb/nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/nav.adoc
rename to api/adoc/userguide/modules/btb/nav.adoc
diff --git a/antora/components/userguide/modules/btb/pages/about.adoc b/api/adoc/userguide/modules/btb/pages/about.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/about.adoc
rename to api/adoc/userguide/modules/btb/pages/about.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment.adoc b/api/adoc/userguide/modules/btb/pages/deployment.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/cmd-line.adoc b/api/adoc/userguide/modules/btb/pages/deployment/cmd-line.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/cmd-line.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/cmd-line.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/docker.adoc b/api/adoc/userguide/modules/btb/pages/deployment/docker.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/docker.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/docker.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc b/api/adoc/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/gae.adoc b/api/adoc/userguide/modules/btb/pages/deployment/gae.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/gae.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/gae.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/jvm-flags.adoc b/api/adoc/userguide/modules/btb/pages/deployment/jvm-flags.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/jvm-flags.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/jvm-flags.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc b/api/adoc/userguide/modules/btb/pages/deployment/neo4j.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/neo4j.adoc
diff --git a/antora/components/userguide/modules/btb/pages/deployment/tomcat.adoc b/api/adoc/userguide/modules/btb/pages/deployment/tomcat.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/deployment/tomcat.adoc
rename to api/adoc/userguide/modules/btb/pages/deployment/tomcat.adoc
diff --git a/antora/components/userguide/modules/btb/pages/headless-access.adoc b/api/adoc/userguide/modules/btb/pages/headless-access.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/headless-access.adoc
rename to api/adoc/userguide/modules/btb/pages/headless-access.adoc
diff --git a/antora/components/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc b/api/adoc/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
rename to api/adoc/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
diff --git a/antora/components/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc b/api/adoc/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
rename to api/adoc/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
rename to api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
diff --git a/antora/components/userguide/modules/btb/pages/i18n.adoc b/api/adoc/userguide/modules/btb/pages/i18n.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/i18n.adoc
rename to api/adoc/userguide/modules/btb/pages/i18n.adoc
diff --git a/antora/components/userguide/modules/btb/pages/other-techniques.adoc b/api/adoc/userguide/modules/btb/pages/other-techniques.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/other-techniques.adoc
rename to api/adoc/userguide/modules/btb/pages/other-techniques.adoc
diff --git a/antora/components/userguide/modules/btb/pages/programming-model.adoc b/api/adoc/userguide/modules/btb/pages/programming-model.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/programming-model.adoc
rename to api/adoc/userguide/modules/btb/pages/programming-model.adoc
diff --git a/antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc b/api/adoc/userguide/modules/btb/pages/programming-model/custom-validator.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
rename to api/adoc/userguide/modules/btb/pages/programming-model/custom-validator.adoc
diff --git a/antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc b/api/adoc/userguide/modules/btb/pages/programming-model/finetuning.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
rename to api/adoc/userguide/modules/btb/pages/programming-model/finetuning.adoc
diff --git a/antora/components/userguide/modules/btb/pages/web-xml.adoc b/api/adoc/userguide/modules/btb/pages/web-xml.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/web-xml.adoc
rename to api/adoc/userguide/modules/btb/pages/web-xml.adoc
diff --git a/antora/components/userguide/modules/btb/partials/module-nav.adoc b/api/adoc/userguide/modules/btb/partials/module-nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/partials/module-nav.adoc
rename to api/adoc/userguide/modules/btb/partials/module-nav.adoc
diff --git a/antora/components/userguide/modules/fun/.asciidoctorconfig b/api/adoc/userguide/modules/fun/.asciidoctorconfig
similarity index 100%
rename from antora/components/userguide/modules/fun/.asciidoctorconfig
rename to api/adoc/userguide/modules/fun/.asciidoctorconfig
diff --git a/antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/api/adoc/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to api/adoc/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/antora/components/userguide/modules/fun/attachments/object-type-taxonomy.pptx b/api/adoc/userguide/modules/fun/attachments/object-type-taxonomy.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/attachments/object-type-taxonomy.pptx
rename to api/adoc/userguide/modules/fun/attachments/object-type-taxonomy.pptx
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx b/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png b/api/adoc/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
rename to api/adoc/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
diff --git a/antora/components/userguide/modules/btb/nav.adoc b/api/adoc/userguide/modules/fun/nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/nav.adoc
rename to api/adoc/userguide/modules/fun/nav.adoc
diff --git a/antora/components/userguide/modules/fun/pages/about.adoc b/api/adoc/userguide/modules/fun/pages/about.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/about.adoc
rename to api/adoc/userguide/modules/fun/pages/about.adoc
diff --git a/antora/components/userguide/modules/fun/pages/available-domain-services.adoc b/api/adoc/userguide/modules/fun/pages/available-domain-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/available-domain-services.adoc
rename to api/adoc/userguide/modules/fun/pages/available-domain-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc b/api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
rename to api/adoc/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
diff --git a/antora/components/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc b/api/adoc/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc
rename to api/adoc/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/events.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/events.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/events.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/events.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/identifiers.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/identifiers.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/identifiers.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/identifiers.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/metamodel.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/metamodel.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/metamodel.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/metamodel.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/modules.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/modules.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/modules.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/modules.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/object-members.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/object-members.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/object-members.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/object-members.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
diff --git a/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
rename to api/adoc/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules.adoc b/api/adoc/userguide/modules/fun/pages/business-rules.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules/actions.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/actions.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules/actions.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules/actions.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules/side-effects.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/side-effects.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules/side-effects.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules/side-effects.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules/usability.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules/usability.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules/validity.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules/validity.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
diff --git a/antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/visibility.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc
rename to api/adoc/userguide/modules/fun/pages/business-rules/visibility.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/deployment-options.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/deployment-options.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/deployment-options.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/deployment-options.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/principles/testable.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/principles/testable.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/core-concepts/principles/testable.adoc
rename to api/adoc/userguide/modules/fun/pages/core-concepts/principles/testable.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud.adoc b/api/adoc/userguide/modules/fun/pages/crud.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud.adoc
rename to api/adoc/userguide/modules/fun/pages/crud.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud/deleting.adoc b/api/adoc/userguide/modules/fun/pages/crud/deleting.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud/deleting.adoc
rename to api/adoc/userguide/modules/fun/pages/crud/deleting.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud/finding.adoc b/api/adoc/userguide/modules/fun/pages/crud/finding.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud/finding.adoc
rename to api/adoc/userguide/modules/fun/pages/crud/finding.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud/instantiating.adoc b/api/adoc/userguide/modules/fun/pages/crud/instantiating.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud/instantiating.adoc
rename to api/adoc/userguide/modules/fun/pages/crud/instantiating.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud/persisting.adoc b/api/adoc/userguide/modules/fun/pages/crud/persisting.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud/persisting.adoc
rename to api/adoc/userguide/modules/fun/pages/crud/persisting.adoc
diff --git a/antora/components/userguide/modules/fun/pages/crud/updating.adoc b/api/adoc/userguide/modules/fun/pages/crud/updating.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/crud/updating.adoc
rename to api/adoc/userguide/modules/fun/pages/crud/updating.adoc
diff --git a/antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc b/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
rename to api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model.adoc b/api/adoc/userguide/modules/fun/pages/programming-model.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/actions.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/actions.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/actions.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/actions.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/collections.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/collections.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/collections.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/collections.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-entities.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-entities.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-entities.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-entities.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/inject-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/inject-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/properties.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/properties.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/dto.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc b/api/adoc/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
rename to api/adoc/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/layout.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints/layout.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints/layout.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints/layout.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/api/adoc/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
rename to api/adoc/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
diff --git a/antora/components/userguide/modules/fun/partials/module-nav.adoc b/api/adoc/userguide/modules/fun/partials/module-nav.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/partials/module-nav.adoc
rename to api/adoc/userguide/modules/fun/partials/module-nav.adoc
diff --git a/antora/components/core/antora.yml b/core/adoc/antora.yml
similarity index 100%
rename from antora/components/core/antora.yml
rename to core/adoc/antora.yml
diff --git a/antora/components/core/modules/archdesign/nav.adoc b/core/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/nav.adoc
rename to core/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/core/modules/ROOT/pages/about.adoc b/core/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/core/modules/ROOT/pages/about.adoc
rename to core/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/core/modules/ROOT/partials/component-nav.adoc b/core/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/core/modules/ROOT/partials/component-nav.adoc
rename to core/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/core/modules/ROOT/partials/module-nav.adoc b/core/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/core/modules/ROOT/partials/module-nav.adoc
rename to core/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/core/modules/archdesign/attachments/modules-dependencies.pptx b/core/adoc/modules/archdesign/attachments/modules-dependencies.pptx
similarity index 100%
rename from antora/components/core/modules/archdesign/attachments/modules-dependencies.pptx
rename to core/adoc/modules/archdesign/attachments/modules-dependencies.pptx
diff --git a/antora/components/core/modules/archdesign/images/modules-dependencies.png b/core/adoc/modules/archdesign/images/modules-dependencies.png
similarity index 100%
rename from antora/components/core/modules/archdesign/images/modules-dependencies.png
rename to core/adoc/modules/archdesign/images/modules-dependencies.png
diff --git a/antora/components/core/modules/ROOT/nav.adoc b/core/adoc/modules/archdesign/nav.adoc
similarity index 100%
rename from antora/components/core/modules/ROOT/nav.adoc
rename to core/adoc/modules/archdesign/nav.adoc
diff --git a/antora/components/core/modules/archdesign/pages/about.adoc b/core/adoc/modules/archdesign/pages/about.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/pages/about.adoc
rename to core/adoc/modules/archdesign/pages/about.adoc
diff --git a/antora/components/core/modules/archdesign/pages/concurrent-task-list.adoc b/core/adoc/modules/archdesign/pages/concurrent-task-list.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/pages/concurrent-task-list.adoc
rename to core/adoc/modules/archdesign/pages/concurrent-task-list.adoc
diff --git a/antora/components/core/modules/archdesign/pages/maven-modules.adoc b/core/adoc/modules/archdesign/pages/maven-modules.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/pages/maven-modules.adoc
rename to core/adoc/modules/archdesign/pages/maven-modules.adoc
diff --git a/antora/components/core/modules/archdesign/pages/metamodel.adoc b/core/adoc/modules/archdesign/pages/metamodel.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/pages/metamodel.adoc
rename to core/adoc/modules/archdesign/pages/metamodel.adoc
diff --git a/antora/components/core/modules/archdesign/pages/webmodules.adoc b/core/adoc/modules/archdesign/pages/webmodules.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/pages/webmodules.adoc
rename to core/adoc/modules/archdesign/pages/webmodules.adoc
diff --git a/antora/components/core/modules/archdesign/partials/module-nav.adoc b/core/adoc/modules/archdesign/partials/module-nav.adoc
similarity index 100%
rename from antora/components/core/modules/archdesign/partials/module-nav.adoc
rename to core/adoc/modules/archdesign/partials/module-nav.adoc
diff --git a/antora/components/incubator/antora.yml b/incubator/adoc/antora.yml
similarity index 100%
rename from antora/components/incubator/antora.yml
rename to incubator/adoc/antora.yml
diff --git a/antora/components/legacy/modules/ROOT/nav.adoc b/incubator/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/legacy/modules/ROOT/nav.adoc
rename to incubator/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/incubator/modules/ROOT/pages/about.adoc b/incubator/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/incubator/modules/ROOT/pages/about.adoc
rename to incubator/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/incubator/modules/ROOT/partials/component-nav.adoc b/incubator/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/incubator/modules/ROOT/partials/component-nav.adoc
rename to incubator/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/incubator/modules/ROOT/partials/module-nav.adoc b/incubator/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/incubator/modules/ROOT/partials/module-nav.adoc
rename to incubator/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/legacy/antora.yml b/legacy/adoc/antora.yml
similarity index 100%
rename from antora/components/legacy/antora.yml
rename to legacy/adoc/antora.yml
diff --git a/antora/components/incubator/modules/ROOT/nav.adoc b/legacy/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/incubator/modules/ROOT/nav.adoc
rename to legacy/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/legacy/modules/ROOT/pages/about.adoc b/legacy/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/legacy/modules/ROOT/pages/about.adoc
rename to legacy/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/legacy/modules/ROOT/partials/component-nav.adoc b/legacy/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/legacy/modules/ROOT/partials/component-nav.adoc
rename to legacy/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/legacy/modules/ROOT/partials/module-nav.adoc b/legacy/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/legacy/modules/ROOT/partials/module-nav.adoc
rename to legacy/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/mappings/antora.yml b/mappings/adoc/antora.yml
similarity index 100%
rename from antora/components/mappings/antora.yml
rename to mappings/adoc/antora.yml
diff --git a/antora/components/mappings/modules/ROOT/nav.adoc b/mappings/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/mappings/modules/ROOT/nav.adoc
rename to mappings/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/mappings/modules/ROOT/pages/about.adoc b/mappings/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/mappings/modules/ROOT/pages/about.adoc
rename to mappings/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/mappings/modules/ROOT/partials/component-nav.adoc b/mappings/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/mappings/modules/ROOT/partials/component-nav.adoc
rename to mappings/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/mappings/modules/ROOT/partials/module-nav.adoc b/mappings/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/mappings/modules/ROOT/partials/module-nav.adoc
rename to mappings/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/security/antora.yml b/security/adoc/antora.yml
similarity index 100%
rename from antora/components/security/antora.yml
rename to security/adoc/antora.yml
diff --git a/antora/components/security/modules/ROOT/attachments/security-apis-impl.pptx b/security/adoc/modules/ROOT/attachments/security-apis-impl.pptx
similarity index 100%
rename from antora/components/security/modules/ROOT/attachments/security-apis-impl.pptx
rename to security/adoc/modules/ROOT/attachments/security-apis-impl.pptx
diff --git a/antora/components/security/modules/ROOT/nav.adoc b/security/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/nav.adoc
rename to security/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/security/modules/ROOT/pages/about.adoc b/security/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/pages/about.adoc
rename to security/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/security/modules/ROOT/pages/domain-services-api-for-applications.adoc b/security/adoc/modules/ROOT/pages/domain-services-api-for-applications.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/pages/domain-services-api-for-applications.adoc
rename to security/adoc/modules/ROOT/pages/domain-services-api-for-applications.adoc
diff --git a/antora/components/security/modules/ROOT/pages/usage-by-isis-viewers.adoc b/security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/pages/usage-by-isis-viewers.adoc
rename to security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/security/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/partials/component-nav.adoc
rename to security/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/security/modules/ROOT/partials/module-nav-end.adoc b/security/adoc/modules/ROOT/partials/module-nav-end.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/partials/module-nav-end.adoc
rename to security/adoc/modules/ROOT/partials/module-nav-end.adoc
diff --git a/antora/components/security/modules/ROOT/partials/module-nav.adoc b/security/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/partials/module-nav.adoc
rename to security/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/subdomains/antora.yml b/subdomains/adoc/antora.yml
similarity index 100%
rename from antora/components/subdomains/antora.yml
rename to subdomains/adoc/antora.yml
diff --git a/antora/components/subdomains/modules/ROOT/nav.adoc b/subdomains/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/subdomains/modules/ROOT/nav.adoc
rename to subdomains/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/subdomains/modules/ROOT/pages/about.adoc b/subdomains/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/subdomains/modules/ROOT/pages/about.adoc
rename to subdomains/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/subdomains/modules/ROOT/partials/component-nav.adoc b/subdomains/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/subdomains/modules/ROOT/partials/component-nav.adoc
rename to subdomains/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc b/subdomains/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
rename to subdomains/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/antora/components/valuetypes/antora.yml b/valuetypes/adoc/antora.yml
similarity index 100%
rename from antora/components/valuetypes/antora.yml
rename to valuetypes/adoc/antora.yml
diff --git a/antora/components/valuetypes/modules/ROOT/nav.adoc b/valuetypes/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/valuetypes/modules/ROOT/nav.adoc
rename to valuetypes/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/valuetypes/modules/ROOT/pages/about.adoc b/valuetypes/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/valuetypes/modules/ROOT/pages/about.adoc
rename to valuetypes/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc b/valuetypes/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc
rename to valuetypes/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc b/valuetypes/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
rename to valuetypes/adoc/modules/ROOT/partials/module-nav.adoc