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/13 21:40:00 UTC

[isis] 04/05: ISIS-2062: reorg the adoc files

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

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

commit 83b8341e5721f811d56559ba71490f825a200778
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 13 20:33:01 2020 +0000

    ISIS-2062: reorg the adoc files
---
 antora/playbooks/site-core.yml                     |   7 -
 antora/playbooks/site-extensions.yml               |  27 +-
 antora/playbooks/site-incubator.yml                |  11 +-
 antora/playbooks/site-legacy.yml                   |   4 +-
 antora/playbooks/site-mappings.yml                 |  10 +-
 antora/playbooks/site-security.yml                 |  15 +-
 antora/playbooks/site-subdomains.yml               |  20 +-
 antora/playbooks/site-testing.yml                  |  14 +-
 antora/playbooks/site-toc.yml                      |   8 +-
 antora/playbooks/site-valuetypes.yml               |   9 +-
 antora/playbooks/site-vro.yml                      |   5 +-
 antora/playbooks/site.yml                          |  87 +++----
 .../modules/config/examples/generated/Other.adoc   |  28 +++
 .../generated/isis.authentication.shiro.adoc       |   6 +
 .../config/examples/generated/isis.persistor.adoc  |   6 +
 .../generated/isis.persistor.datanucleus.adoc      |  20 ++
 .../generated/isis.persistor.datanucleus.impl.adoc | 225 +++++++++++++++++
 .../config/examples/generated/isis.reflector.adoc  |  29 +++
 .../examples/generated/isis.reflector.facet.adoc   | 149 +++++++++++
 .../generated/isis.reflector.validator.adoc        |  85 +++++++
 .../examples/generated/isis.service.email.adoc     |  59 +++++
 .../config/examples/generated/isis.services.adoc   |  60 +++++
 .../generated/isis.viewer.restfulobjects.adoc      |  58 +++++
 .../examples/generated/isis.viewer.wicket.adoc     | 276 +++++++++++++++++++++
 .../config/examples/generated/isis.viewers.adoc    |  34 +++
 .../config/examples/generated/resteasy.adoc        |  21 ++
 .../jdo/flywayjdo/{src/main => }/adoc/antora.yml   |   0
 .../{src/main => }/adoc/modules/flywayjdo/nav.adoc |   0
 .../adoc/modules/flywayjdo/pages/about.adoc        |   0
 .../modules/flywayjdo/partials/module-nav.adoc     |   0
 .../security/secman/adoc}/antora.yml               |   0
 ...s-security-module-realm-with-delegate-realm.PNG | Bin
 ...iro-to-use-isisaddons-security-module-realm.PNG | Bin
 .../security/secman/adoc/modules/secman}/nav.adoc  |   0
 .../main => }/adoc/modules/secman/pages/about.adoc |   0
 .../main => }/adoc/modules/secman/pages/api.adoc   |   0
 .../modules/secman/pages/jbcrypt-encryption.adoc   |   0
 .../adoc/modules/secman/pages/jdo-persistence.adoc |   0
 .../main => }/adoc/modules/secman/pages/model.adoc |   0
 .../adoc/modules/secman/pages/shiro-realm.adoc     |   0
 .../adoc/modules/secman/partials/module-nav.adoc   |   0
 .../security/shiro-realm-ldap/adoc}/antora.yml     |   0
 .../modules/shiro-realm-ldap/examples/shiro.ini    |   0
 .../adoc/modules/shiro-realm-ldap}/nav.adoc        |   0
 .../adoc/modules/shiro-realm-ldap/pages/about.adoc |   0
 .../shiro-realm-ldap/partials/module-nav.adoc      |   0
 .../doc => extensions/vro/cors/adoc}/antora.yml    |   0
 .../cors/{src/main => }/adoc/modules/cors/nav.adoc |   0
 .../vro/cors/adoc/modules/cors}/pages/about.adoc   |   0
 .../adoc/modules/cors/partials/module-nav.adoc     |   0
 extensions/vro/cors/src/main/adoc/antora.yml       |   2 -
 .../src/main => exceldownload}/adoc/antora.yml     |   0
 .../adoc/modules/exceldownload}/nav.adoc           |   0
 .../adoc/modules/exceldownload/pages/about.adoc    |   0
 .../modules/exceldownload/partials/module-nav.adoc |   0
 .../src/main => pdfjs}/adoc/antora.yml             |   0
 .../vw/pdfjs/adoc/modules/pdfjs}/nav.adoc          |   0
 .../main => }/adoc/modules/pdfjs/pages/about.adoc  |   0
 .../adoc/modules/pdfjs/partials/module-nav.adoc    |   0
 .../doc => core/model/src/main/adoc}/antora.yml    |   0
 .../model/src/main/adoc/modules/model}/nav.adoc    |   0
 .../src/main/adoc/modules/model/pages/about.adoc   |   0
 .../adoc/modules/model/partials/module-nav.adoc    |   0
 incubator/core/model/src/main/doc/antora.yml       |   2 -
 .../core/model/src/main/doc/modules/model/nav.adoc |   1 -
 .../src/main/doc/modules/model/pages/about.adoc    |   5 -
 .../doc/modules/model/partials/module-nav.adoc     |   4 -
 incubator/extensions/.gitkeep                      |   0
 .../core/microprofile/src/main/adoc/antora.yml     |   2 -
 .../src/main/adoc/modules/microprofile/nav.adoc    |   1 -
 .../adoc/modules/microprofile/pages/about.adoc     |   5 -
 .../modules/microprofile/partials/module-nav.adoc  |   4 -
 .../microprofile}/src/main/adoc/antora.yml         |   0
 .../src/main/adoc/modules/microprofile}/nav.adoc   |   0
 .../modules/microprofile/pages/about.adoc          |   0
 .../modules/microprofile/partials/module-nav.adoc  |   0
 .../src/main => jaxrsclient}/adoc/antora.yml       |   0
 .../jaxrsclient/adoc/modules/jaxrsclient}/nav.adoc |   0
 .../adoc/modules/jaxrsclient/pages/about.adoc      |   0
 .../modules/jaxrsclient/partials/module-nav.adoc   |   0
 .../{restclient/src/main => minio}/adoc/antora.yml |   0
 .../minio/adoc/modules/minio}/nav.adoc             |   0
 .../main => }/adoc/modules/minio/pages/about.adoc  |   0
 .../adoc/modules/minio/partials/module-nav.adoc    |   0
 .../{minio/src/main => restclient}/adoc/antora.yml |   0
 .../restclient/adoc/modules/restclient}/nav.adoc   |   0
 .../adoc/modules/restclient/pages/about.adoc       |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../src/main/adoc/modules/restclient/nav.adoc      |   1 -
 .../src/main => slack}/adoc/antora.yml             |   0
 .../slack/adoc/modules/slack}/nav.adoc             |   0
 .../main => }/adoc/modules/slack/pages/about.adoc  |   0
 .../adoc/modules/slack/partials/module-nav.adoc    |   0
 mavendeps/{src/main => }/adoc/antora.yml           |   0
 .../{src/main => }/adoc/modules/mavendeps/nav.adoc |   0
 .../adoc/modules/mavendeps/pages/about.adoc        |   0
 preview.sh                                         |  68 ++---
 scripts/ci/build-site.sh                           |  27 +-
 security/bypass/src/main/{doc => adoc}/antora.yml  |   0
 .../configure-isis-to-use-bypass.PNG               | Bin
 .../src/main/{doc => adoc}/modules/bypass/nav.adoc |   0
 .../{doc => adoc}/modules/bypass/pages/about.adoc  |   0
 .../modules/bypass/partials/module-nav.adoc        |   0
 .../keycloak}/src/main/adoc/antora.yml             |   0
 .../src/main/adoc/modules/keycloak}/nav.adoc       |   0
 .../modules/keycloak/pages/about.adoc              |   0
 .../modules/keycloak/partials/module-nav.adoc      |   0
 .../shiro}/src/main/adoc/antora.yml                |   0
 .../configuration/configure-isis-to-use-shiro.png  | Bin
 .../ini/configure-shiro-to-use-ini-realm.png       | Bin
 .../configure-shiro-to-use-custom-jdbc-realm.png   | Bin
 .../ldap/activeds-ldap-groups.png                  | Bin
 .../ldap/activeds-ldap-mojo-partition.png          | Bin
 .../ldap/activeds-ldap-mojo-root-dse.png           | Bin
 .../ldap/activeds-ldap-sasl-authentication.png     | Bin
 .../configuring-shiro/ldap/activeds-ldap-users.png | Bin
 .../configure-shiro-to-use-isis-ldap-realm.png     | Bin
 .../shiro/src/main/adoc/modules/shiro}/nav.adoc    |   0
 .../{doc => adoc}/modules/shiro/pages/about.adoc   |   0
 .../pages/about/configuring-isis-to-use-shiro.adoc |   0
 .../pages/about/enhanced-wildcard-permission.adoc  |   0
 .../modules/shiro/pages/about/ini-realm.adoc       |   0
 .../modules/shiro/pages/about/jdbc-realm.adoc      |   0
 .../modules/shiro/pages/about/ldap-realm.adoc      |   0
 .../modules/shiro/pages/about/run-as.adoc          |   0
 .../modules/shiro/pages/about/shiro-caching.adoc   |   0
 .../modules/shiro/partials/module-nav.adoc         |   0
 starters/{src/main => }/adoc/antora.yml            |   0
 .../helloworld => adoc/modules/ROOT}/nav.adoc      |   0
 .../main => }/adoc/modules/ROOT/pages/about.adoc   |   0
 .../adoc/modules/helloworld}/images/.gitkeep       |   0
 .../helloworld/images/helloworld-before-launch.png | Bin
 .../adoc/modules/helloworld/images/helloworld.png  | Bin
 .../images/using-hello-world/010-root-page.png     | Bin
 .../020-login-to-wicket-viewer.png                 | Bin
 .../images/using-hello-world/030-home-page.png     | Bin
 .../040-create-object-from-menu.png                | Bin
 .../050-create-object-from-menu-prompt.png         | Bin
 .../using-hello-world/060-created-object.png       | Bin
 .../images/using-hello-world/070-update-name.png   | Bin
 .../images/using-hello-world/080-edit-notes.png    | Bin
 .../images/using-hello-world/090-delete-object.png | Bin
 .../using-hello-world/100-object-deleted.png       | Bin
 .../200-swagger-ui-before-reload.png               | Bin
 .../using-hello-world/210-helloworld-resources.png | Bin
 .../220-create-object-thru-rest-api.png            | Bin
 .../230-create-object-thru-rest-api-response.png   | Bin
 .../240-retrieve-object-using-rest-api.png         | Bin
 ...250-retrieve-object-using-rest-api-response.png | Bin
 .../ROOT => adoc/modules/helloworld}/nav.adoc      |   0
 .../adoc/modules/helloworld/pages/about.adoc       |   0
 .../modules/simpleapp/images/dockerhub-tags.png    | Bin
 .../images/simpleapp-webapp-before-launch.png      | Bin
 .../images/simpleapp-webapp-with-fixtures.png      | Bin
 .../modules/simpleapp/images/simpleapp-webapp.png  | Bin
 .../images/using-simple-app/030-home-page.png      | Bin
 .../040-run-fixture-script-menu.png                | Bin
 .../050-run-fixture-script-prompt.png              | Bin
 .../060-run-fixture-script-result.png              | Bin
 .../images/using-simple-app/070-home-page.png      | Bin
 .../using-simple-app/structure/structure.pptx      | Bin
 .../structure/structure/Slide1.PNG                 | Bin
 .../structure/structure/Slide2.PNG                 | Bin
 .../{src/main => }/adoc/modules/simpleapp/nav.adoc |   0
 .../adoc/modules/simpleapp/pages/about.adoc        |   0
 .../main/adoc/modules/helloworld/images/.gitkeep   |   0
 .../{zip/src/main/doc => base/adoc}/antora.yml     |   0
 .../pdfbox => base/adoc/modules/base}/nav.adoc     |   0
 .../doc => adoc}/modules/base/pages/about.adoc     |   0
 .../modules/base/partials/module-nav.adoc          |   0
 .../src/main/doc => docx/adoc}/antora.yml          |   0
 .../ognl => docx/adoc/modules/docx}/nav.adoc       |   0
 .../doc => adoc}/modules/docx/pages/about.adoc     |   0
 .../modules/docx/partials/module-nav.adoc          |   0
 .../{spring/src/main/doc => excel/adoc}/antora.yml |   0
 .../adoc/modules/excel}/nav.adoc                   |   0
 .../doc => adoc}/modules/excel/pages/about.adoc    |   0
 .../modules/excel/partials/module-nav.adoc         |   0
 .../src/main/doc => freemarker/adoc}/antora.yml    |   0
 .../adoc/modules/freemarker}/nav.adoc              |   0
 .../modules/freemarker/pages/about.adoc            |   0
 .../modules/freemarker/partials/module-nav.adoc    |   0
 subdomains/ognl/{src/main/doc => adoc}/antora.yml  |   0
 .../docx => ognl/adoc/modules/ognl}/nav.adoc       |   0
 .../doc => adoc}/modules/ognl/pages/about.adoc     |   0
 .../modules/ognl/partials/module-nav.adoc          |   0
 .../src/main/doc => pdfbox/adoc}/antora.yml        |   0
 .../base => pdfbox/adoc/modules/pdfbox}/nav.adoc   |   0
 .../doc => adoc}/modules/pdfbox/pages/about.adoc   |   0
 .../modules/pdfbox/partials/module-nav.adoc        |   0
 .../{excel/src/main/doc => spring/adoc}/antora.yml |   0
 .../{src/main/doc => adoc}/modules/spring/nav.adoc |   0
 .../doc => adoc}/modules/spring/pages/about.adoc   |   0
 .../modules/spring/partials/module-nav.adoc        |   0
 .../src/main/doc => xdocreport/adoc}/antora.yml    |   0
 .../xdocreport/adoc/modules/xdocreport}/nav.adoc   |   0
 .../modules/xdocreport/pages/about.adoc            |   0
 .../modules/xdocreport/partials/module-nav.adoc    |   0
 .../{base/src/main/doc => zip/adoc}/antora.yml     |   0
 .../zip/adoc/modules/zip}/nav.adoc                 |   0
 .../main/doc => adoc}/modules/zip/pages/about.adoc |   0
 .../modules/zip/partials/module-nav.adoc           |   0
 .../src/main => fakedata}/adoc/antora.yml          |   0
 .../adoc/modules/fakedata}/nav.adoc                |   0
 .../adoc/modules/fakedata/pages/about.adoc         |   0
 .../adoc/modules/fakedata/partials/module-nav.adoc |   0
 .../src/main => fixtures}/adoc/antora.yml          |   0
 .../adoc/modules/fixtures/images/composite.png     | Bin
 .../adoc/modules/fixtures/images/flat-1.png        | Bin
 .../adoc/modules/fixtures/images/flat-2.png        | Bin
 .../images/organizing-fixture-scripts.pptx         | Bin
 .../fixtures/images/prompt-specifying-number.png   | Bin
 .../adoc/modules/fixtures/images/prompt.png        | Bin
 .../modules/fixtures/images/prototyping-menu.png   | Bin
 .../adoc/modules/fixtures/images/result-list.png   | Bin
 .../adoc/modules/fixtures}/nav.adoc                |   0
 .../adoc/modules/fixtures/pages/about.adoc         |   0
 .../pages/fixture-scripts/api-and-usage.adoc       |   0
 .../pages/fixture-scripts/sudo-service.adoc        |   0
 .../fixture-scripts/ticking-clock-fixture.adoc     |   0
 .../adoc/modules/fixtures/partials/module-nav.adoc |   0
 .../src/main => h2console}/adoc/antora.yml         |   0
 .../h2console/adoc/modules/h2console}/nav.adoc     |   0
 .../adoc/modules/h2console/pages/about.adoc        |   0
 .../modules/h2console/partials/module-nav.adoc     |   0
 testing/hsqldbmgr/{src/main => }/adoc/antora.yml   |   0
 .../{src/main => }/adoc/modules/hsqldbmgr/nav.adoc |   0
 .../adoc/modules/hsqldbmgr/pages/about.adoc        |   0
 .../modules/hsqldbmgr/partials/module-nav.adoc     |   0
 .../src/main => integtestsupport}/adoc/antora.yml  |   0
 .../integtestsupport/images/integ-tests.png        | Bin
 .../integtestsupport/images/integ-tests.pptx       | Bin
 .../integtestsupport/images/wrapper-factory.png    | Bin
 .../adoc/modules/integtestsupport/nav.adoc         |   0
 .../adoc/modules/integtestsupport/pages/about.adoc |   0
 .../integtestsupport/pages/abstract-class.adoc     |   0
 .../integtestsupport/pages/bootstrapping.adoc      |   0
 .../pages/configuration-properties.adoc            |   0
 .../pages/maven-configuration.adoc                 |   0
 .../integtestsupport/pages/typical-usage.adoc      |   0
 .../integtestsupport/pages/wrapper-factory.adoc    |   0
 .../integtestsupport/partials/module-nav.adoc      |   0
 .../src/main => specsupport}/adoc/antora.yml       |   0
 .../adoc/modules/specsupport}/nav.adoc             |   0
 .../adoc/modules/specsupport/pages/about.adoc      |   0
 .../modules/specsupport/pages/how-it-works.adoc    |   0
 .../specsupport/pages/maven-configuration.adoc     |   0
 .../specsupport/pages/writing-a-bdd-spec.adoc      |   0
 .../modules/specsupport/partials/module-nav.adoc   |   0
 .../src/main => unittestsupport}/adoc/antora.yml   |   0
 .../adoc/modules/unit-test-support-ext}/nav.adoc   |   0
 .../modules/unit-test-support-ext/pages/about.adoc |   0
 .../unit-test-support-ext/partials/module-nav.adoc |   0
 .../{sse/src/main => asciidoc}/adoc/antora.yml     |   0
 .../{src/main => }/adoc/modules/asciidoc/nav.adoc  |   0
 .../adoc/modules/asciidoc/pages/about.adoc         |   0
 .../adoc/modules/asciidoc/partials/module-nav.adoc |   0
 valuetypes/markdown/{src/main => }/adoc/antora.yml |   0
 .../markdown/adoc/modules/markdown}/nav.adoc       |   0
 .../adoc/modules/markdown}/pages/about.adoc        |   0
 .../adoc/modules/markdown/partials/module-nav.adoc |   0
 .../{asciidoc/src/main => sse}/adoc/antora.yml     |   0
 .../sse/{src/main => }/adoc/modules/sse/nav.adoc   |   0
 .../main => }/adoc/modules/sse/pages/about.adoc    |   0
 .../adoc/modules/sse/partials/module-nav.adoc      |   0
 .../restfulobjects/{src/main => }/adoc/antora.yml  |   0
 .../ro-spec-resources-and-representations.png      | Bin
 .../ROOT/images/rgfis/service-collaborations.png   | Bin
 .../{src/main => }/adoc/modules/ROOT/nav.adoc      |   0
 .../main => }/adoc/modules/ROOT/pages/about.adoc   |   0
 .../adoc/modules/ROOT/pages/architecture.adoc      |   0
 .../ROOT/pages/configuration-properties.adoc       |   0
 .../adoc/modules/ROOT/pages/health-check.adoc      |   0
 .../adoc/modules/ROOT/pages/hints-and-tips.adoc    |   0
 .../ROOT/pages/hints-and-tips/angular-tips.adoc    |   0
 .../ROOT/pages/hints-and-tips/pretty-printing.adoc |   0
 .../hints-and-tips/restful-image-property.adoc     |   0
 .../ROOT/pages/hints-and-tips/troubleshooting.adoc |   0
 .../hints-and-tips/using-chrome-devtools.adoc      |   0
 .../hints-and-tips/view-model-as-parameter.adoc    |   0
 .../adoc/modules/ROOT/pages/layout-resources.adoc  |   0
 .../main => }/adoc/modules/ROOT/pages/ro-spec.adoc |   0
 .../adoc/modules/ROOT/pages/security.adoc          |   0
 .../ROOT/pages/simplified-representations.adoc     |   0
 .../action-invocation.adoc                         |   0
 .../apache-isis-profile.adoc                       |   0
 .../configuration-properties.adoc                  |   0
 .../simplified-representations/domain-object.adoc  |   0
 .../object-collection.adoc                         |   0
 .../other-representations.adoc                     |   0
 .../adoc/modules/ROOT/partials/component-nav.adoc  |   2 +
 .../adoc/modules/ROOT/partials/module-nav.adoc     |   0
 .../ROOT/partials/security/user-registration.adoc  |   0
 .../modules/ROOT/partials/security/web-xml.adoc    |   0
 .../modules/jaxrs-resteasy-4/attachments/.gitkeep  |   0
 .../modules/jaxrs-resteasy-4/examples/.gitignore   |   1 -
 .../doc/modules/jaxrs-resteasy-4/pages/about.adoc  |   3 -
 .../jaxrs-resteasy-4/partials/module-nav.adoc      |   1 -
 .../adoc/modules/ROOT/partials/component-nav.adoc  |   5 -
 viewers/wicket/{src/main => }/adoc/antora.yml      |   0
 .../modules/ROOT/images/about-page/about-page.png  | Bin
 .../ROOT/images/application-menu/dividers.png      | Bin
 .../ROOT/images/application-menu/layout-menus.pdn  | Bin
 .../ROOT/images/application-menu/layout-menus.png  | Bin
 .../ROOT/images/application-menu/tertiary.png      | Bin
 .../blob-attachments/010-attachment-field-940.png  | Bin
 .../blob-attachments/010-attachment-field.png      | Bin
 .../blob-attachments/020-edit-choose-file-940.png  | Bin
 .../blob-attachments/020-edit-choose-file.png      | Bin
 .../030-choose-file-using-browser-520.png          | Bin
 .../030-choose-file-using-browser.png              | Bin
 .../040-edit-chosen-file-indicated-940.png         | Bin
 .../040-edit-chosen-file-indicated.png             | Bin
 .../050-ok-if-image-then-rendered-940.png          | Bin
 .../050-ok-if-image-then-rendered.png              | Bin
 .../images/blob-attachments/060-download-940.png   | Bin
 .../ROOT/images/blob-attachments/060-download.png  | Bin
 .../images/blob-attachments/070-edit-clear-940.png | Bin
 .../images/blob-attachments/070-edit-clear.png     | Bin
 .../ROOT/images/bookmarked-pages/panel-940.png     | Bin
 .../images/bookmarked-pages/panel-estatio-940.png  | Bin
 .../ROOT/images/bookmarked-pages/panel-estatio.png | Bin
 .../modules/ROOT/images/bookmarked-pages/panel.png | Bin
 .../ROOT/images/brand-logo/brand-logo-signin.png   | Bin
 .../modules/ROOT/images/brand-logo/brand-logo.png  | Bin
 .../images/copy-link/010-copy-link-button-940.png  | Bin
 .../ROOT/images/copy-link/010-copy-link-button.png | Bin
 .../images/copy-link/020-copy-link-dialog-940.png  | Bin
 .../ROOT/images/copy-link/020-copy-link-dialog.png | Bin
 .../ROOT/images/copy-link/030-hints-940.png        | Bin
 .../modules/ROOT/images/copy-link/030-hints.png    | Bin
 .../copy-link/040-copy-link-with-hints-940.png     | Bin
 .../images/copy-link/040-copy-link-with-hints.png  | Bin
 .../ROOT/images/copy-link/050-title-url-940.png    | Bin
 .../ROOT/images/copy-link/050-title-url.png        | Bin
 .../adoc/modules/ROOT/images/dialog-mode/modal.png | Bin
 .../modules/ROOT/images/dialog-mode/sidebar.png    | Bin
 .../ROOT/images/embedded-view/no-footer.png        | Bin
 .../images/embedded-view/no-header-no-footer.png   | Bin
 .../ROOT/images/embedded-view/no-header.png        | Bin
 .../modules/ROOT/images/embedded-view/regular.png  | Bin
 .../images/features/recent-pages/recent-pages.png  | Bin
 .../object-titles-and-icons/cust-order-product.png | Bin
 .../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
 .../ROOT/images/layout-dynamic-xml/ToDoItem.png    | Bin
 .../modules/ROOT/images/layouts/customer-order.png | Bin
 .../ROOT/images/layouts/estatio-Invoice.png        | Bin
 .../modules/ROOT/images/layouts/estatio-Lease.png  | Bin
 .../ROOT/images/layouts/estatio-LeaseItem.png      | Bin
 .../ROOT/images/layouts/todoapp-ToDoItem.png       | Bin
 .../modules/ROOT/images/menubars/010-download.png  | Bin
 .../modules/ROOT/images/menubars/020-download.png  | Bin
 .../ROOT/images/reference-layout/4-0-8-0.png       | Bin
 .../ROOT/images/reference-layout/4-4-4-12.png      | Bin
 .../ROOT/images/reference-layout/6-6-0-12.png      | Bin
 .../reference-layout/isis-layout-show-facets.css   |   0
 .../ROOT/images/reference-layout/isis-layout.css   |   0
 .../images/reference-layout/layout-4-0-8-0.html    |   0
 .../images/reference-layout/layout-4-4-4-12.html   |   0
 .../images/reference-layout/layout-6-6-0-12.html   |   0
 .../login-page-default.png                         | Bin
 .../login-page-suppress-password-reset.png         | Bin
 .../suppress-remember-me}/login-page-default.png   | Bin
 .../login-page-suppress-remember-me.png            | Bin
 .../suppress-sign-up}/login-page-default.png       | Bin
 .../login-page-suppress-sign-up.png                | Bin
 .../ROOT/images/theme-chooser/example-1.png        | Bin
 .../ROOT/images/theme-chooser/example-2.png        | Bin
 .../user-registration}/login-page-default.png      | Bin
 .../sign-up-after-registration.png                 | Bin
 .../sign-up-email-with-verification-link.png       | Bin
 .../sign-up-login-page-after-sign-up.png           | Bin
 .../ROOT/images/user-registration/sign-up-page.png | Bin
 .../sign-up-registration-page.png                  | Bin
 .../ROOT/images/where-am-i/hello_grey_bg.png       | Bin
 .../wicket/adoc/modules/ROOT}/nav.adoc             |   0
 .../main => }/adoc/modules/ROOT/pages/about.adoc   |   0
 .../ROOT/pages/configuration-properties.adoc       |   0
 .../adoc/modules/ROOT/pages/customisation.adoc     |   0
 .../ROOT/pages/customisation/about-page.adoc       |   0
 .../ROOT/pages/customisation/auto-refresh.adoc     |   0
 .../ROOT/pages/customisation/brand-logo.adoc       |   0
 .../customisation/cheap-n-cheerful-theme.adoc      |   0
 .../pages/customisation/custom-javascript.adoc     |   0
 .../pages/customisation/request-parameters.adoc    |   0
 .../pages/customisation/top-level-index-page.adoc  |   0
 .../pages/customisation/tweaking-css-classes.adoc  |   0
 .../customisation/using-different-css-file.adoc    |   0
 .../ROOT/pages/customisation/welcome-page.adoc     |   0
 .../adoc/modules/ROOT/pages/extending.adoc         |   0
 .../pages/extending/custom-bootstrap-theme.adoc    |   0
 .../modules/ROOT/pages/extending/custom-pages.adoc |   0
 .../login-via-query-args-prototyping.adoc          |   0
 .../pages/extending/replacing-page-elements.adoc   |   0
 .../adoc/modules/ROOT/pages/features.adoc          |   0
 .../ROOT/pages/features/blob-attachments.adoc      |   0
 .../ROOT/pages/features/bookmarked-pages.adoc      |   0
 .../ROOT/pages/features/hints-and-copy-url.adoc    |   0
 .../modules/ROOT/pages/features/recent-pages.adoc  |   0
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |   0
 .../ROOT/pages/features/titles-in-tables.adoc      |   0
 .../ROOT/pages/features/user-registration.adoc     |   0
 .../modules/ROOT/pages/features/where-am-i.adoc    |   0
 .../adoc/modules/ROOT/pages/hints-and-tips.adoc    |   0
 .../hints-and-tips/highlight-current-row.adoc      |   0
 .../i18n-label-in-wicket-viewer.adoc               |   0
 .../ROOT/pages/hints-and-tips/per-user-themes.adoc |   0
 .../ROOT/pages/hints-and-tips/svg-support.adoc     |   0
 .../adoc/modules/ROOT/pages/incode-platform.adoc   |   0
 .../main => }/adoc/modules/ROOT/pages/layout.adoc  |   0
 .../ROOT/pages/layout/annotation-based.adoc        |   0
 .../adoc/modules/ROOT/pages/layout/file-based.adoc |   0
 .../modules/ROOT/pages/layout/table-columns.adoc   |   0
 .../adoc/modules/ROOT/pages/menubars-layout.adoc   |   0
 .../pages/menubars-layout/annotation-based.adoc    |   0
 .../ROOT/pages/menubars-layout/file-based.adoc     |   0
 .../adoc/modules/ROOT/pages/security.adoc          |   0
 .../adoc/modules/ROOT/partials/component-nav.adoc  |   0
 .../adoc/modules/ROOT/partials/module-nav.adoc     |   0
 .../adoc/modules/ROOT/partials/security/pages.adoc |   0
 .../ROOT/partials/security/user-registration.adoc  |   0
 421 files changed, 1202 insertions(+), 205 deletions(-)

diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index f4d0d65..5884839 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -32,14 +32,7 @@ content:
       start_path: core/runtime/src/main/adoc # core
       branches: HEAD
     - url: .
-<<<<<<< HEAD
       start_path: core/runtimeservices/src/main/doc # core
-=======
-      start_path: core/webspringboot/src/main/adoc # core
-      branches: HEAD
-    - url: .
-      start_path: core/runtimeservices/src/main/adoc # core
->>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
     - url: .
       start_path: core/webapp/src/main/adoc # core
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index a8bb75b..a344949 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -17,39 +17,24 @@ content:
 
 # extensions
     - url: .
-      start_path: extensions/persistence/flywayjdo/src/main/adoc # extensions
+      start_path: extensions/persistence/jdo/flywayjdo/adoc # extensions
       branches: HEAD
 
     - url: .
-      start_path: extensions/security/secman/src/main/adoc # security
+      start_path: extensions/security/secman/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/api/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/secman/encryption-jbcrypt/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/secman/model/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/secman/persistence-jdo/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/secman/shiro-realm/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
+      start_path: extensions/security/shiro-realm-ldap/adoc # security
       branches: HEAD
 
     - url: .
-      start_path: extensions/vro/cors/src/main/adoc # vro
+      start_path: extensions/vro/cors/adoc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/vw/exceldownload/src/main/adoc # vw
+      start_path: extensions/vw/exceldownload/adoc # vw
       branches: HEAD
     - url: .
-      start_path: extensions/vw/pdfjs/src/main/adoc # vw
+      start_path: extensions/vw/pdfjs/adoc # vw
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 4d111a8..cca3daf 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -17,17 +17,10 @@ content:
 
 # incubator
     - url: .
-<<<<<<< HEAD
-      start_path: incubator/core/model/src/main/doc # incubator
+      start_path: incubator/core/model/src/main/adoc # incubator
       branches: HEAD
     - url: .
-      start_path: incubator/mappings/microprofile/src/main/doc # incubator
-=======
-      start_path: incubator/extensions/core/model/src/main/adoc # incubator
-      branches: HEAD
-    - url: .
-      start_path: incubator/extensions/core/microprofile/src/main/adoc # incubator
->>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
+      start_path: incubator/mappings/microprofile/src/main/adoc # incubator
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 8d038eb..7bca332 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -26,10 +26,10 @@ content:
       start_path: legacy/extensions/core/runtime/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/mappings/restclient/src/main/adoc # legacy
+      start_path: legacy/mappings/restclient/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/subdomains/servletapi/impl/src/main/adoc # legacy
+      start_path: legacy/subdomains/servletapi/adoc # legacy
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index ab3d81c..5d91742 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -15,18 +15,18 @@ content:
       start_path: antora/components/mappings # mappings
       branches: HEAD
 
-    # mappings
+# mappings
     - url: .
-      start_path: mappings/jaxrsclient/src/main/adoc # mappings
+      start_path: mappings/jaxrsclient/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/minio/src/main/adoc # mappings
+      start_path: mappings/minio/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/restclient/src/main/adoc # mappings
+      start_path: mappings/restclient/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/slack/src/main/adoc # mappings
+      start_path: mappings/slack/adoc # mappings
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 1a7ec2e..8d73166 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -20,6 +20,14 @@ content:
       start_path: core/security/src/main/adoc # security
       branches: HEAD
 
+# extensions
+    - url: .
+      start_path: extensions/security/secman/adoc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/shiro-realm-ldap/adoc # security
+      branches: HEAD
+
 # security
     - url: .
       start_path: security/bypass/src/main/adoc # security
@@ -31,13 +39,6 @@ content:
       start_path: security/keycloak/src/main/adoc # security
       branches: HEAD
 
-# extensions
-    - url: .
-      start_path: extensions/security/secman/src/main/adoc # security
-      branches: HEAD
-    - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
-      branches: HEAD
 
 
 ui:
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index f2a0621..52de13f 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -15,33 +15,33 @@ content:
       start_path: antora/components/subdomains # subdomains
       branches: HEAD
 
-    # subdomains
+# subdomains
     - url: .
-      start_path: subdomains/base/src/main/adoc # subdomains
+      start_path: subdomains/base/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/docx/src/main/adoc # subdomains
+      start_path: subdomains/docx/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/excel/src/main/adoc # subdomains
+      start_path: subdomains/excel/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/freemarker/src/main/adoc # subdomains
+      start_path: subdomains/freemarker/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/ognl/src/main/adoc # subdomains
+      start_path: subdomains/ognl/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/pdfbox/src/main/adoc # subdomains
+      start_path: subdomains/pdfbox/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/spring/src/main/adoc # subdomains
+      start_path: subdomains/spring/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/xdocreport/src/main/adoc # subdomains
+      start_path: subdomains/xdocreport/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/zip/src/main/adoc # subdomains
+      start_path: subdomains/zip/adoc # subdomains
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 49fb3d1..64a6d90 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -22,25 +22,25 @@ content:
 
 # testing
     - url: .
-      start_path: testing/fakedata/src/main/adoc # testing
+      start_path: testing/fakedata/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/fixtures/src/main/adoc # testing
+      start_path: testing/fixtures/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/h2console/src/main/adoc # testing
+      start_path: testing/h2console/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/hsqldbmgr/impl/src/main/adoc # testing
+      start_path: testing/hsqldbmgr/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/integtestsupport/src/main/adoc # testing
+      start_path: testing/integtestsupport/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/specsupport/src/main/adoc # testing
+      start_path: testing/specsupport/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/unittestsupport/src/main/adoc # testing
+      start_path: testing/unittestsupport/adoc # testing
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-toc.yml b/antora/playbooks/site-toc.yml
index 74e27f7..a768bfc 100644
--- a/antora/playbooks/site-toc.yml
+++ b/antora/playbooks/site-toc.yml
@@ -11,14 +11,14 @@ content:
       start_path: antora/components/toc # toc
       branches: HEAD
 
-# starters
+# mavendeps
     - url: .
-      start_path: starters/src/main/adoc # toc
+      start_path: mavendeps/adoc # toc
       branches: HEAD
 
-# mavendeps
+# starters
     - url: .
-      start_path: mavendeps/src/main/adoc # toc
+      start_path: starters/adoc # toc
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 6b42a13..b5a8742 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -15,18 +15,17 @@ content:
       start_path: antora/components/valuetypes # valuetypes
       branches: HEAD
 
-    # valuetypes
+# valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/src/main/adoc # vw
+      start_path: valuetypes/asciidoc/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/src/main/adoc # vw
+      start_path: valuetypes/markdown/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/src/main/adoc # vw
+      start_path: valuetypes/sse/adoc # vw
       branches: HEAD
 
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index f838515..8a539b5 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -21,10 +21,7 @@ content:
 
 # extensions
     - url: .
-      start_path: extensions/vro/cors/src/main/adoc # vro
-      branches: HEAD
-    - url: .
-      start_path: extensions/vro/restclient/src/main/adoc # vro
+      start_path: extensions/vro/cors/adoc # vro
       branches: HEAD
 
 
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 0c401d1..59d248a 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -76,14 +76,7 @@ content:
       start_path: core/runtime/src/main/adoc # core
       branches: HEAD
     - url: .
-<<<<<<< HEAD
       start_path: core/runtimeservices/src/main/doc # core
-=======
-      start_path: core/webspringboot/src/main/adoc # core
-      branches: HEAD
-    - url: .
-      start_path: core/runtimeservices/src/main/adoc # core
->>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
     - url: .
       start_path: core/webapp/src/main/adoc # core
@@ -95,13 +88,10 @@ content:
       start_path: core/unittestsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: viewers/restfulobjects/jaxrs-resteasy-4/src/main/adoc # vro
-      branches: HEAD
-    - url: .
-      start_path: viewers/restfulobjects/src/main/adoc # vro
+      start_path: viewers/restfulobjects/adoc # vro
       branches: HEAD
     - url: .
-      start_path: viewers/wicket/src/main/adoc # vw
+      start_path: viewers/wicket/adoc # vw
       branches: HEAD
 
 # examples
@@ -114,39 +104,32 @@ content:
 
 # extensions
     - url: .
-      start_path: extensions/persistence/jdo/flywayjdo/src/main/adoc # extensions
+      start_path: extensions/persistence/jdo/flywayjdo/adoc # extensions
       branches: HEAD
 
     - url: .
-      start_path: extensions/security/secman/src/main/adoc # security
+      start_path: extensions/security/secman/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
+      start_path: extensions/security/shiro-realm-ldap/adoc # security
       branches: HEAD
 
     - url: .
-      start_path: extensions/vro/cors/src/main/adoc # vro
+      start_path: extensions/vro/cors/adoc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/vw/exceldownload/src/main/adoc # vw
+      start_path: extensions/vw/exceldownload/adoc # vw
       branches: HEAD
     - url: .
-      start_path: extensions/vw/pdfjs/src/main/adoc # vw
+      start_path: extensions/vw/pdfjs/adoc # vw
       branches: HEAD
 
 # incubator
     - url: .
-<<<<<<< HEAD
-      start_path: incubator/core/model/src/main/doc # incubator
+      start_path: incubator/core/model/src/main/adoc # incubator
       branches: HEAD
     - url: .
       start_path: incubator/mappings/microprofile/src/main/doc # incubator
-=======
-      start_path: incubator/extensions/core/model/src/main/adoc # incubator
-      branches: HEAD
-    - url: .
-      start_path: incubator/extensions/core/microprofile/src/main/adoc # incubator
->>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
 
 # legacy
@@ -163,26 +146,26 @@ content:
       start_path: legacy/mappings/restclient/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/subdomains/servletapi/impl/src/main/adoc # legacy
+      start_path: legacy/subdomains/servletapi/src/main/adoc # legacy
       branches: HEAD
 
 # mappings
     - url: .
-      start_path: mappings/jaxrsclient/src/main/adoc # mappings
+      start_path: mappings/jaxrsclient/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/minio/src/main/adoc # mappings
+      start_path: mappings/minio/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/restclient/src/main/adoc # mappings
+      start_path: mappings/restclient/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/slack/src/main/adoc # mappings
+      start_path: mappings/slack/adoc # mappings
       branches: HEAD
 
 # mavendeps
     - url: .
-      start_path: mavendeps/src/main/adoc # toc
+      start_path: mavendeps/adoc # toc
       branches: HEAD
 
 # security
@@ -198,70 +181,70 @@ content:
 
 # starters
     - url: .
-      start_path: starters/src/main/adoc # toc
+      start_path: starters/adoc # toc
       branches: HEAD
 
 # subdomains
     - url: .
-      start_path: subdomains/base/src/main/adoc # subdomains
+      start_path: subdomains/base/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/docx/src/main/adoc # subdomains
+      start_path: subdomains/docx/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/excel/src/main/adoc # subdomains
+      start_path: subdomains/excel/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/freemarker/src/main/adoc # subdomains
+      start_path: subdomains/freemarker/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/ognl/src/main/adoc # subdomains
+      start_path: subdomains/ognl/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/pdfbox/src/main/adoc # subdomains
+      start_path: subdomains/pdfbox/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/spring/src/main/adoc # subdomains
+      start_path: subdomains/spring/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/xdocreport/src/main/adoc # subdomains
+      start_path: subdomains/xdocreport/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/zip/src/main/adoc # subdomains
+      start_path: subdomains/zip/adoc # subdomains
       branches: HEAD
 
 # testing
     - url: .
-      start_path: testing/fakedata/src/main/adoc # testing
+      start_path: testing/fakedata/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/fixtures/src/main/adoc # testing
+      start_path: testing/fixtures/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/h2console/src/main/adoc # testing
+      start_path: testing/h2console/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/hsqldbmgr/src/main/adoc # testing
+      start_path: testing/hsqldbmgr/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/integtestsupport/src/main/adoc # testing
+      start_path: testing/integtestsupport/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/specsupport/src/main/adoc # testing
+      start_path: testing/specsupport/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/unittestsupport/src/main/adoc # testing
+      start_path: testing/unittestsupport/adoc # testing
       branches: HEAD
 
 # valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/src/main/adoc # vw
+      start_path: valuetypes/asciidoc/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/src/main/adoc # vw
+      start_path: valuetypes/markdown/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/src/main/adoc # vw
+      start_path: valuetypes/sse/adoc # vw
       branches: HEAD
 
 ui:
diff --git a/core/config/src/main/doc/modules/config/examples/generated/Other.adoc b/core/config/src/main/doc/modules/config/examples/generated/Other.adoc
new file mode 100644
index 0000000..b132868
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/Other.adoc
@@ -0,0 +1,28 @@
+| isis.as-map
+| 
+| 
+
+| isis.isis-settings
+| 
+| 
+
+| isis.locale
+| 
+|  Set to override {@link Locale#getDefault()}
+
+| isis.objects.editing
+| 
+| 
+
+| isis.timezone
+| 
+| 
+
+| isis.value.format
+| 
+| 
+
+| isis.value.money.currency
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.authentication.shiro.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.authentication.shiro.adoc
new file mode 100644
index 0000000..99f563e
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.authentication.shiro.adoc
@@ -0,0 +1,6 @@
+| isis.authentication.shiro. +
+auto-logout-if-already- +
+authenticated
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.adoc
new file mode 100644
index 0000000..a155b72
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.adoc
@@ -0,0 +1,6 @@
+| isis.persistor. +
+enforce-safe-semantics
+| 
+|  Default is `false</code> only for backward compatibility (to avoid lots of breakages in existing code); in future might change to `true</code>.  +
+     currently disabled (in ISIS-921); to reinstate in ISIS-922? else delete.  @deprecated
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.adoc
new file mode 100644
index 0000000..f7d8fe7
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.adoc
@@ -0,0 +1,20 @@
+| isis.persistor.datanucleus. +
+class-metadata-loaded- +
+listener
+|  org.apache.isis.persistence. +
+jdo.datanucleus5.datanucleus. +
+CreateSchemaObjectFromClassMet +
+adata
+| 
+
+| isis.persistor.datanucleus. +
+install-fixtures
+| 
+| 
+
+| isis.persistor.datanucleus. +
+standalone-collection. +
+bulk-load
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc
new file mode 100644
index 0000000..81ef212
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc
@@ -0,0 +1,225 @@
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+ConnectionFactory2Name
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+ConnectionFactoryName
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+ConnectionPasswordDecrypter
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+PersistenceUnitLoadClasses
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.cache.level2. +
+mode
+| 
+|  Values of javax.persistence.SharedCacheMode, capitalized
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.cache.level2. +
+type
+|  none
+|  Name of the type of Level 2 Cache to use.  +
+ Can be used to interface with external caching products. Use "none" to turn off L2 caching.   +
+ See also Cache docs for JDO, and for JPA 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+connection-factory-name
+| 
+|  The JNDI name for a connection factory for transactional connections. 	 +
+ 	    For RBDMS, it must be a JNDI name that points to a javax.sql.DataSource object. 	  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+connection-factory2-name
+| 
+|  The JNDI name for a connection factory for non-transactional connections. 	 +
+ 	    For RBDMS, it must be a JNDI name that points to a javax.sql.DataSource object. 	  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+connection-password-decrypter
+| 
+|  Name of a class that implements `org.datanucleus.store.connection.DecryptionProvider</tt> and should only be specified if the password is encrypted in the persistence properties.  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.identifier. +
+case
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+object-provider.class-name
+|  org.apache.isis.persistence. +
+jdo.datanucleus5.datanucleus. +
+JDOStateManagerForIsis
+|  New feature in DN 3.2.3; enables dependency injection into entities  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+objectProvider.className
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+persistence-unit-load-classes
+|  true
+|  Used when we have specified the persistence-unit name for a PMF/EMF and where we want the 	datastore "tables" for all classes of that persistence-unit loading up into the StoreManager.  +
+     Defaults to true, which is the opposite of DataNucleus' own default.     (The reason that DN defaults to false is because some databases are slow so such an     operation would slow down the startup process).   +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+persistenceByReachabilityAtCom +
+mit
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+auto-create-all
+| 
+|  Whether DN should automatically create the database schema on bootstrapping.  +
+     This should be set to `true</tt> when running against an in-memory database, but     set to `false</tt> when running against a persistent database (use something like     flyway instead to manage schema evolution).   +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+auto-create-database
+| 
+|  Previously we defaulted this property to "true", but that could cause the target database to be modified  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+autoCreateAll
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+autoCreateDatabase
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+validate-all
+|  true
+|   +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+validateAll
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+validateConstraints
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus.schema. +
+validateTables
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.datanucleus. +
+transaction-type
+| 
+|  Type of transaction to use.  +
+ If running under JavaSE the default is RESOURCE_LOCAL, and if running under JavaEE the default is JTA.   +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo. +
+PersistenceManagerFactoryClass +
+
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+ConnectionDriverName
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+ConnectionPassword
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+ConnectionURL
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+ConnectionUserName
+| 
+| 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+connection-driver-name
+| 
+|  JDBC driver used by DataNucleus Object store to connect.  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+connection-password
+| 
+|  Password for the user account used by DataNucleus Object store to connect.  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+connection-url
+| 
+|  URL used by DataNucleus Object store to connect.  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo.option. +
+connection-user-name
+| 
+|  User account used by DataNucleus Object store to connect.  +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
+| isis.persistor.datanucleus. +
+impl.javax.jdo. +
+persistence-manager-factory- +
+class
+|  org.datanucleus.api.jdo. +
+JDOPersistenceManagerFactory
+|   +
+     See also `additional-spring-configuration-metadata.json</tt> (change casing). 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
new file mode 100644
index 0000000..2d512c2
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
@@ -0,0 +1,29 @@
+| isis.reflector. +
+explicit-annotations.action
+| 
+|  Whether or not a public method needs to be annotated with @{@link org.apache.isis.applib.annotation.Action} in order to be picked up as an action in the metamodel.
+
+| isis.reflector.introspector. +
+lock-after-full-introspection
+|  true
+|  If true, then no new specifications will be allowed to be loaded once introspection has been complete.  +
+ Only applies if the introspector is configured to perform full introspection up-front (either because of {@link IntrospectionMode#FULL} or {@link IntrospectionMode#LAZY_UNLESS_PRODUCTION} when in production); otherwise is ignored. 
+
+| isis.reflector.introspector. +
+mode
+| 
+|  Whether all known types should be fully introspected as part of the bootstrapping, or should only be partially introspected initially.  +
+ Leaving this as lazy means that there's a chance that metamodel validation errors will not be discovered during bootstrap.  That said, metamodel validation is still run incrementally for any classes introspected lazily after initial bootstrapping (unless {@link #isValidateIncrementally()} is disabled. 
+
+| isis.reflector.introspector. +
+parallelize
+|  true
+|  Whether to perform introspection in parallel.
+
+| isis.reflector.introspector. +
+validate-incrementally
+|  true
+|  If true, then metamodel validation is performed after any new specification has been loaded (after the initial bootstrapping).  +
+ This does _not</i> apply if the introspector is configured to perform full introspection up-front AND when the metamodel is {@link #isLockAfterFullIntrospection() locked} after initial bootstrapping (because in that case the lock check will simply prevent any new specs from being loaded). But it will apply otherwise.   +
+In particular, this setting _can</i> still apply even if the {@link #getMode() introspection mode} is set to {@link IntrospectionMode#FULL full}, because that in itself does not preclude some code from attempting to load some previously unknown type.  For example, a fixture script could attempt to invoke an action on some new type using the {@link org.apache.isis.applib.services.wrapper.WrapperFactory} - this will cause introspection of that new type to be performed. 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.facet.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.facet.adoc
new file mode 100644
index 0000000..c241e2e
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.facet.adoc
@@ -0,0 +1,149 @@
+| isis.reflector.facet. +
+action-annotation. +
+domain-event.post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+collection-annotation. +
+domain-event.post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+css-class-fa.patterns
+| 
+| 
+
+| isis.reflector.facet. +
+css-class.patterns
+| 
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+created-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+loaded-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+persisted-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+persisting-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+removing-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+updated-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-annotation. +
+updating-lifecycle-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-layout- +
+annotation.css-class-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-layout- +
+annotation.icon-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-layout- +
+annotation.layout-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+domain-object-layout- +
+annotation.title-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+filter-visibility
+|  true
+| 
+
+| isis.reflector.facet. +
+property-annotation. +
+domain-event.post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+view-model-layout-annotation. +
+css-class-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+view-model-layout-annotation. +
+icon-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+view-model-layout-annotation. +
+layout-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facet. +
+view-model-layout-annotation. +
+title-ui-event. +
+post-for-default
+|  true
+| 
+
+| isis.reflector.facets. +
+ignore-deprecated
+| 
+| 
+
+| isis.reflector.facets. +
+view-model-semantic-checking- +
+facet-factory.enable
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
new file mode 100644
index 0000000..365bfe9
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
@@ -0,0 +1,85 @@
+| isis.reflector.validator. +
+action-collection-parameter- +
+choices
+|  true
+| 
+
+| isis.reflector.validator. +
+allow-deprecated
+|  true
+| 
+
+| isis.reflector.validator. +
+check-module-extent
+|  true
+| 
+
+| isis.reflector.validator. +
+ensure-unique-object-types
+|  true
+| 
+
+| isis.reflector.validator. +
+explicit-object-type
+| 
+| 
+
+| isis.reflector.validator. +
+jaxb-view-model-date-time- +
+type-adapter
+|  true
+| 
+
+| isis.reflector.validator. +
+jaxb-view-model-no-arg- +
+constructor
+| 
+| 
+
+| isis.reflector.validator. +
+jaxb-view-model-not-abstract
+|  true
+| 
+
+| isis.reflector.validator. +
+jaxb-view-model-not-inner- +
+class
+|  true
+| 
+
+| isis.reflector.validator. +
+jaxb-view-model-reference- +
+type-adapter
+|  true
+| 
+
+| isis.reflector.validator. +
+jdoql-from-clause
+|  true
+| 
+
+| isis.reflector.validator. +
+jdoql-variables-clause
+|  true
+| 
+
+| isis.reflector.validator. +
+no-params-only
+| 
+| 
+
+| isis.reflector.validator. +
+parallelize
+|  true
+|  Whether to perform metamodel validation in parallel.
+
+| isis.reflector.validator. +
+mixins-only
+|  true
+| 
+
+| isis.reflector.validator. +
+service-actions-only
+|  true
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.service.email.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.service.email.adoc
new file mode 100644
index 0000000..bb70e4f
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.service.email.adoc
@@ -0,0 +1,59 @@
+| isis.service.email.override. +
+bcc
+| 
+| 
+
+| isis.service.email.override. +
+cc
+| 
+| 
+
+| isis.service.email.override. +
+to
+| 
+| 
+
+| isis.service.email.port
+|  587
+| 
+
+| isis.service.email.sender. +
+address
+| 
+| 
+
+| isis.service.email.sender. +
+hostname
+| 
+| 
+
+| isis.service.email.sender. +
+password
+| 
+| 
+
+| isis.service.email.sender. +
+username
+| 
+| 
+
+| isis.service.email. +
+socket-connection-timeout
+|  2000
+| 
+
+| isis.service.email. +
+socket-timeout
+|  2000
+| 
+
+| isis.service.email. +
+throw-exception-on-fail
+|  true
+| 
+
+| isis.service.email.tls. +
+enabled
+|  true
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.services.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.services.adoc
new file mode 100644
index 0000000..bdfb089
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.services.adoc
@@ -0,0 +1,60 @@
+| isis.services. +
+application-features.init
+| 
+| 
+
+| isis.services.audit.objects
+| 
+| 
+
+| isis.services.command.actions
+| 
+| 
+
+| isis.services.command. +
+properties
+| 
+| 
+
+| isis.services.container. +
+disable-auto-flush
+| 
+|  Normally any queries are automatically preceded by flushing pending executions.  +
+ This key allows this behaviour to be disabled.  +
+     Originally introduced as part of ISIS-1134 (fixing memory leaks in the objectstore)     where it was found that the autoflush behaviour was causing a (now unrepeatable)     data integrity error (see <a href="https://issues.apache.org/jira/browse/ISIS-1134?focusedCommentId=14500638&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14500638">ISIS-1134 comment</a>, in the isis-module-security.     However, that this could be circumvented by removing the call [...]
+
+| isis.services. +
+exception-recognizer- +
+composite-for-jdo-object- +
+store.disable
+| 
+| 
+
+| isis.services.injector. +
+inject-prefix
+|  true
+| 
+
+| isis.services.injector. +
+set-prefix
+| 
+| 
+
+| isis.services.publish.actions
+| 
+| 
+
+| isis.services.publish.objects
+| 
+| 
+
+| isis.services.publish. +
+properties
+| 
+| 
+
+| isis.services.translation.po. +
+mode
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
new file mode 100644
index 0000000..8c68489
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
@@ -0,0 +1,58 @@
+| isis.viewer.restfulobjects. +
+base-uri
+| 
+|  If left unset (the default), then the RO viewer will use the {@link javax.ws.rs.core.UriInfo} injected using  @link javax.ws.rs.core.Context}) to figure out the base Uri (used to render `href</code>s).  +
+ This will be correct much of the time, but will almost certainly be wrong if there is a reverse proxy.   +
+ If set, eg `https://dev.myapp.com/</code>, then this value will be used instead. 
+
+| isis.viewer.restfulobjects. +
+gsoc2013.legacy-param-details
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+honor-ui-hints
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+object-property-values-only
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+strict-accept-checking
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-described-by-links
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-member-disabled- +
+reason
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-member-extensions
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-member-id
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-member-links
+| 
+| 
+
+| isis.viewer.restfulobjects. +
+suppress-update-link
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.wicket.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.wicket.adoc
new file mode 100644
index 0000000..bd4c912
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.wicket.adoc
@@ -0,0 +1,276 @@
+| isis.viewer.wicket. +
+ajax-debug-mode
+| 
+|  Whether the Ajax debug should be shown.
+
+| isis.viewer.wicket.app
+|  org.apache.isis.viewer. +
+wicket.viewer.wicketapp. +
+IsisWicketApplication
+| 
+
+| isis.viewer.wicket. +
+application.about
+| 
+|  Label used on the about page. If not specified, then {@link Application#name}  is used instead.
+
+| isis.viewer.wicket. +
+application.brand-logo-header
+| 
+|  Either the location of the image file (relative to the class-path resource root),  or an absolute URL. This is rendered on the header panel. An image with a size of 160x40 works well. If not specified, the application.name is used instead.
+
+| isis.viewer.wicket. +
+application.brand-logo-signin
+| 
+|  Either the location of the image file (relative to the class-path resource root),  or an absolute URL.  This is rendered on the sign-in page. An image with a size of 400x40 works well.  If not specified, the {@link Application#name} is used instead.
+
+| isis.viewer.wicket. +
+application.css
+| 
+|  URL of file to read any custom CSS, relative to relative to the class-path resource  root.
+
+| isis.viewer.wicket. +
+application. +
+favicon-content-type
+| 
+| 
+
+| isis.viewer.wicket. +
+application.favicon-url
+| 
+| 
+
+| isis.viewer.wicket. +
+application.js
+| 
+|  URL of file to read any custom Javascript, relative to the class-path resource root.
+
+| isis.viewer.wicket. +
+application. +
+menubars-layout-xml
+|  menubars.layout.xml
+| 
+
+| isis.viewer.wicket. +
+application.name
+|  Apache Isis â„¢
+|  Identifies the application on the sign-in page (unless a {@link Application#brandLogoSignin} image is configured) and  on top-left in the header  (unless a {@link Application#brandLogoHeader} image is configured).
+
+| isis.viewer.wicket. +
+application.version
+| 
+|  The version of the application, eg 1.0, 1.1, etc. If present, then this will be shown in the footer on every page as well as on the  about page.
+
+| isis.viewer.wicket.base-path
+|  /wicket/
+| 
+
+| isis.viewer.wicket. +
+bookmarked-pages.max-size
+|  15
+| 
+
+| isis.viewer.wicket. +
+bookmarked-pages.show-chooser
+|  true
+|  Determines whether the bookmarks should be available in the header.
+
+| isis.viewer.wicket. +
+breadcrumbs.show-chooser
+|  true
+|  Determines whether the breadcrumbs should be available in the footer.
+
+| isis.viewer.wicket. +
+clear-original-destination
+| 
+| 
+
+| isis.viewer.wicket.credit
+| 
+|  IntelliJ unfortunately does not provide IDE completion for lists of classes; YMMV. For further discussion, see for example this stackoverflow question: https://stackoverflow.com/questions/41417933/spring-configuration-properties-metadata-json-for-nested-list-of-objects and this wiki page: https://github.com/spring-projects/spring-boot/wiki/IDE-binding-features#simple-pojo and
+
+| isis.viewer.wicket. +
+date-pattern
+|  dd-MM-yyyy
+|  The pattern used for rendering and parsing dates.  +
+ Each Date scalar panel will use {@ #getDatePattern()} or {@linkplain #getDateTimePattern()} depending on its date type.  In the case of panels with a date picker, the pattern will be dynamically adjusted so that it can be used by the <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime Picker</a> component (which uses <a href="http://momentjs.com/docs/#/parsing/string-format/">Moment.js formats</a>, rather than those of regular Java code).
+
+| isis.viewer.wicket. +
+date-picker.max-date
+|  2100-01-01T00:00:00.000Z
+|  As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
+
+| isis.viewer.wicket. +
+date-picker.min-date
+|  1900-01-01T00:00:00.000Z
+|  As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
+
+| isis.viewer.wicket. +
+date-time-pattern
+|  dd-MM-yyyy HH:mm
+|  The pattern used for rendering and parsing date/times.  +
+ Each Date scalar panel will use {@link Wicket#getDatePattern()} or {@link Wicket#getDateTimePattern()} depending on its date type.  In the case of panels with a date time picker, the pattern will be dynamically adjusted so that it can be used by the <a href="https://github.com/Eonasdan/bootstrap-datetimepicker">Bootstrap Datetime Picker</a> component (which uses <a href="http://momentjs.com/docs/#/parsing/string-format/">Moment.js formats</a>, rather than those of regular Java code).
+
+| isis.viewer.wicket. +
+development-utilities.enable
+| 
+|  Determines whether debug bar and other stuff influenced by `org.apache.wicket.settings.DebugSettings#isDevelopmentUtilitiesEnabled()</tt> is enabled or not.  +
+     By default, depends on the mode (prototyping = enabled, server = disabled).  This property acts as an override. 
+
+| isis.viewer.wicket. +
+dialog-mode
+| 
+| 
+
+| isis.viewer.wicket. +
+dialog-mode-for-menu
+| 
+| 
+
+| isis.viewer.wicket. +
+live-reload-url
+| 
+| 
+
+| isis.viewer.wicket. +
+max-title-length-in-parented- +
+tables
+| 
+| 
+
+| isis.viewer.wicket. +
+max-title-length-in- +
+standalone-tables
+| 
+| 
+
+| isis.viewer.wicket. +
+max-title-length-in-tables
+|  12
+| 
+
+| isis.viewer.wicket. +
+prevent-double-click-for-form- +
+submit
+|  true
+|  Whether to disable a form submit button after it has been clicked, to prevent users causing an error if they do a double click. This behaviour is enabled by default, but can be disabled using this flag.
+
+| isis.viewer.wicket. +
+prevent-double-click-for-no- +
+arg-action
+|  true
+|  Whether to disable a no-arg action button after it has been clicked, to prevent users causing an error if they do a double click. This behaviour is enabled by default, but can be disabled using this flag.
+
+| isis.viewer.wicket. +
+prompt-style
+| 
+|  Whether to use a modal dialog for property edits and for actions associated with properties. This can be overridden on a case-by-case basis using `@PropertyLayout#promptStyle</code> and `@ActionLayout#promptStyle</code>. This behaviour is disabled by default; the viewer will use an inline prompt in these cases, making for a smoother user experience. If enabled then this reinstates the pre-1.15.0 behaviour of using a dialog prompt in all cases.
+
+| isis.viewer.wicket. +
+redirect-even-if-same-object
+| 
+|  Whether to redirect to a new page, even if the object being shown (after an action invocation or a property edit) is the same as the previous page. This behaviour is disabled by default; the viewer will update the existing page if it can, making for a smoother user experience. If enabled then this reinstates the pre-1.15.0 behaviour of redirecting in all cases.
+
+| isis.viewer.wicket. +
+remember-me.cookie-key
+|  isisWicketRememberMe
+| 
+
+| isis.viewer.wicket. +
+remember-me.encryption-key
+| 
+| 
+
+| isis.viewer.wicket. +
+remember-me.suppress
+| 
+| 
+
+| isis.viewer.wicket. +
+replace-disabled-tag-with- +
+readonly-tag
+|  true
+|  in Firefox and more recent versions of Chrome 54+, cannot copy out of disabled fields; instead we use the readonly attribute (https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#the-readonly-attribute) This behaviour is enabled by default but can be disabled using this flag
+
+| isis.viewer.wicket. +
+show-footer
+|  true
+| 
+
+| isis.viewer.wicket. +
+strip-wicket-tags
+|  true
+|  Whether Wicket tags should be stripped from the markup.  +
+ Be aware that if Wicket tags are _not</i> stripped, then this may break CSS rules on some browsers. 
+
+| isis.viewer.wicket. +
+suppress-password-reset
+| 
+| 
+
+| isis.viewer.wicket. +
+suppress-sign-up
+| 
+| 
+
+| isis.viewer.wicket.themes. +
+enabled
+| 
+|  A comma separated list of enabled theme names, as defined by https://bootswatch.com.
+
+| isis.viewer.wicket.themes. +
+initial
+|  Flatly
+|  The initial theme to use.  +
+     Expected to be in the list of {@link #getEnabled()} themes. 
+
+| isis.viewer.wicket.themes. +
+provider
+|  org.apache.isis.viewer. +
+wicket.ui.components.widgets. +
+themepicker. +
+IsisWicketThemeSupportDefault
+| 
+
+| isis.viewer.wicket.themes. +
+show-chooser
+| 
+|  Whether the theme chooser should be available in the footer.
+
+| isis.viewer.wicket. +
+timestamp-pattern
+|  yyyy-MM-dd HH:mm:ss.SSS
+|  The pattern used for rendering and parsing timestamps.
+
+| isis.viewer.wicket. +
+use-indicator-for-form-submit
+|  true
+|  Whether to show an indicator for a form submit button that it has been clicked. This behaviour is enabled by default, but can be disabled using this flag.
+
+| isis.viewer.wicket. +
+use-indicator-for-no-arg- +
+action
+|  true
+|  Whether to show an indicator for a no-arg action button that it has been clicked. This behaviour is enabled by default, but can be disabled using this flag.
+
+| isis.viewer.wicket.welcome. +
+text
+| 
+|  Text to be displayed on the application’s home page, used as a fallback if  welcome.file is not specified. If a @HomePage action exists, then that will take  precedence.
+
+| isis.viewer.wicket.where-am-i. +
+enabled
+|  true
+| 
+
+| isis.viewer.wicket.where-am-i. +
+max-parent-chain-length
+|  64
+| 
+
+| isis.viewer.wicket. +
+wicket-source-plugin
+| 
+|  Whether the Wicket source plugin should be enabled; if so, the markup includes links to the Wicket source.  +
+     Be aware that this can substantially impact performance. 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewers.adoc b/core/config/src/main/doc/modules/config/examples/generated/isis.viewers.adoc
new file mode 100644
index 0000000..d3c5b8b
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/isis.viewers.adoc
@@ -0,0 +1,34 @@
+| isis.viewers. +
+collection-layout. +
+default-view
+| 
+| 
+
+| isis.viewers.paged.parented
+|  12
+| 
+
+| isis.viewers.paged.standalone
+|  25
+| 
+
+| isis.viewers.parameter-layout. +
+label
+| 
+| 
+
+| isis.viewers.parameter-layout. +
+label-position
+| 
+| 
+
+| isis.viewers.property-layout. +
+label
+| 
+| 
+
+| isis.viewers.property-layout. +
+label-position
+| 
+| 
+
diff --git a/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc b/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
new file mode 100644
index 0000000..8a8ac8b
--- /dev/null
+++ b/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
@@ -0,0 +1,21 @@
+| resteasy.as-map
+| 
+| 
+
+| resteasy.environment
+| 
+| 
+
+| resteasy.jaxrs.app. +
+registration
+| 
+| 
+
+| resteasy.jaxrs.default-path
+|  /restful
+|  Note that this is used rather than `resteasy.servlet.mapping.prefix</code> because there is _NO</i> implementation of {@link javax.ws.rs.core.Application}, so we rely on it being automatically created.
+
+| resteasy.resteasy-settings
+| 
+| 
+
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/adoc/antora.yml b/extensions/persistence/jdo/flywayjdo/adoc/antora.yml
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/adoc/antora.yml
rename to extensions/persistence/jdo/flywayjdo/adoc/antora.yml
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/nav.adoc b/extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/nav.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/nav.adoc
rename to extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/nav.adoc
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/pages/about.adoc b/extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/pages/about.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/pages/about.adoc
rename to extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/pages/about.adoc
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/partials/module-nav.adoc b/extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/partials/module-nav.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/partials/module-nav.adoc
rename to extensions/persistence/jdo/flywayjdo/adoc/modules/flywayjdo/partials/module-nav.adoc
diff --git a/security/shiro/src/main/doc/antora.yml b/extensions/security/secman/adoc/antora.yml
similarity index 100%
rename from security/shiro/src/main/doc/antora.yml
rename to extensions/security/secman/adoc/antora.yml
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/security/shiro/src/main/doc/modules/shiro/nav.adoc b/extensions/security/secman/adoc/modules/secman/nav.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/nav.adoc
rename to extensions/security/secman/adoc/modules/secman/nav.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/about.adoc b/extensions/security/secman/adoc/modules/secman/pages/about.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/about.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/about.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/api.adoc b/extensions/security/secman/adoc/modules/secman/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/api.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/api.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/jbcrypt-encryption.adoc b/extensions/security/secman/adoc/modules/secman/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/jbcrypt-encryption.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/jdo-persistence.adoc b/extensions/security/secman/adoc/modules/secman/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/jdo-persistence.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/model.adoc b/extensions/security/secman/adoc/modules/secman/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/model.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/model.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/pages/shiro-realm.adoc b/extensions/security/secman/adoc/modules/secman/pages/shiro-realm.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/pages/shiro-realm.adoc
rename to extensions/security/secman/adoc/modules/secman/pages/shiro-realm.adoc
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/partials/module-nav.adoc b/extensions/security/secman/adoc/modules/secman/partials/module-nav.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/partials/module-nav.adoc
rename to extensions/security/secman/adoc/modules/secman/partials/module-nav.adoc
diff --git a/security/keycloak/src/main/doc/antora.yml b/extensions/security/shiro-realm-ldap/adoc/antora.yml
similarity index 100%
rename from security/keycloak/src/main/doc/antora.yml
rename to extensions/security/shiro-realm-ldap/adoc/antora.yml
diff --git a/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/examples/shiro.ini b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/examples/shiro.ini
rename to extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini
diff --git a/security/keycloak/src/main/doc/modules/keycloak/nav.adoc b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/nav.adoc
similarity index 100%
rename from security/keycloak/src/main/doc/modules/keycloak/nav.adoc
rename to extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/nav.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/pages/about.adoc b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/pages/about.adoc
rename to extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
rename to extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml b/extensions/vro/cors/adoc/antora.yml
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/antora.yml
rename to extensions/vro/cors/adoc/antora.yml
diff --git a/extensions/vro/cors/src/main/adoc/modules/cors/nav.adoc b/extensions/vro/cors/adoc/modules/cors/nav.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/adoc/modules/cors/nav.adoc
rename to extensions/vro/cors/adoc/modules/cors/nav.adoc
diff --git a/valuetypes/markdown/src/main/adoc/modules/markdown/pages/about.adoc b/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/adoc/modules/markdown/pages/about.adoc
rename to extensions/vro/cors/adoc/modules/cors/pages/about.adoc
diff --git a/extensions/vro/cors/src/main/adoc/modules/cors/partials/module-nav.adoc b/extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/adoc/modules/cors/partials/module-nav.adoc
rename to extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc
diff --git a/extensions/vro/cors/src/main/adoc/antora.yml b/extensions/vro/cors/src/main/adoc/antora.yml
deleted file mode 100644
index 576eb80..0000000
--- a/extensions/vro/cors/src/main/adoc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: vro
-version: master
diff --git a/extensions/vw/pdfjs/src/main/adoc/antora.yml b/extensions/vw/exceldownload/adoc/antora.yml
similarity index 100%
rename from extensions/vw/pdfjs/src/main/adoc/antora.yml
rename to extensions/vw/exceldownload/adoc/antora.yml
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/nav.adoc b/extensions/vw/exceldownload/adoc/modules/exceldownload/nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/nav.adoc
rename to extensions/vw/exceldownload/adoc/modules/exceldownload/nav.adoc
diff --git a/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/pages/about.adoc b/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
similarity index 100%
rename from extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/pages/about.adoc
rename to extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
diff --git a/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/partials/module-nav.adoc b/extensions/vw/exceldownload/adoc/modules/exceldownload/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/partials/module-nav.adoc
rename to extensions/vw/exceldownload/adoc/modules/exceldownload/partials/module-nav.adoc
diff --git a/extensions/vw/exceldownload/src/main/adoc/antora.yml b/extensions/vw/pdfjs/adoc/antora.yml
similarity index 100%
rename from extensions/vw/exceldownload/src/main/adoc/antora.yml
rename to extensions/vw/pdfjs/adoc/antora.yml
diff --git a/valuetypes/markdown/src/main/adoc/modules/markdown/nav.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/nav.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/adoc/modules/markdown/nav.adoc
rename to extensions/vw/pdfjs/adoc/modules/pdfjs/nav.adoc
diff --git a/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/pages/about.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/pages/about.adoc
rename to extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
diff --git a/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/partials/module-nav.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/partials/module-nav.adoc
rename to extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc
diff --git a/incubator/mappings/microprofile/src/main/doc/antora.yml b/incubator/core/model/src/main/adoc/antora.yml
similarity index 100%
rename from incubator/mappings/microprofile/src/main/doc/antora.yml
rename to incubator/core/model/src/main/adoc/antora.yml
diff --git a/incubator/mappings/microprofile/src/main/doc/modules/microprofile/nav.adoc b/incubator/core/model/src/main/adoc/modules/model/nav.adoc
similarity index 100%
rename from incubator/mappings/microprofile/src/main/doc/modules/microprofile/nav.adoc
rename to incubator/core/model/src/main/adoc/modules/model/nav.adoc
diff --git a/incubator/extensions/core/model/src/main/adoc/modules/model/pages/about.adoc b/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/adoc/modules/model/pages/about.adoc
rename to incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
diff --git a/incubator/extensions/core/model/src/main/adoc/modules/model/partials/module-nav.adoc b/incubator/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
rename to incubator/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
diff --git a/incubator/core/model/src/main/doc/antora.yml b/incubator/core/model/src/main/doc/antora.yml
deleted file mode 100644
index 74244f9..0000000
--- a/incubator/core/model/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: incubator
-version: master
diff --git a/incubator/core/model/src/main/doc/modules/model/nav.adoc b/incubator/core/model/src/main/doc/modules/model/nav.adoc
deleted file mode 100644
index a946dfb..0000000
--- a/incubator/core/model/src/main/doc/modules/model/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/core/model/src/main/doc/modules/model/pages/about.adoc b/incubator/core/model/src/main/doc/modules/model/pages/about.adoc
deleted file mode 100644
index b49c7ed..0000000
--- a/incubator/core/model/src/main/doc/modules/model/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= @Model Support
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-TODO: v2: placeholder for documentation about incubator/model
-
diff --git a/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
deleted file mode 100644
index 26d195f..0000000
--- a/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-* xref:incubator:model:about.adoc[@Model]
-
-
-
diff --git a/incubator/extensions/.gitkeep b/incubator/extensions/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/antora.yml b/incubator/extensions/core/microprofile/src/main/adoc/antora.yml
deleted file mode 100644
index 74244f9..0000000
--- a/incubator/extensions/core/microprofile/src/main/adoc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: incubator
-version: master
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc
deleted file mode 100644
index a946dfb..0000000
--- a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
deleted file mode 100644
index 3754da4..0000000
--- a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= MicroProfile
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-TODO: v2: placeholder for documentation about incubator/model
-
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
deleted file mode 100644
index 82ebf0f..0000000
--- a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-* xref:incubator:microprofile:about.adoc[MicroProfile]
-
-
-
diff --git a/incubator/extensions/core/model/src/main/adoc/antora.yml b/incubator/mappings/microprofile/src/main/adoc/antora.yml
similarity index 100%
rename from incubator/extensions/core/model/src/main/adoc/antora.yml
rename to incubator/mappings/microprofile/src/main/adoc/antora.yml
diff --git a/incubator/extensions/core/model/src/main/adoc/modules/model/nav.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/nav.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/adoc/modules/model/nav.adoc
rename to incubator/mappings/microprofile/src/main/adoc/modules/microprofile/nav.adoc
diff --git a/incubator/mappings/microprofile/src/main/doc/modules/microprofile/pages/about.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
similarity index 100%
rename from incubator/mappings/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
rename to incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
diff --git a/incubator/mappings/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
similarity index 100%
rename from incubator/mappings/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
rename to incubator/mappings/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
diff --git a/mappings/slack/src/main/adoc/antora.yml b/mappings/jaxrsclient/adoc/antora.yml
similarity index 100%
rename from mappings/slack/src/main/adoc/antora.yml
rename to mappings/jaxrsclient/adoc/antora.yml
diff --git a/testing/h2console/src/main/adoc/modules/h2console/nav.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from testing/h2console/src/main/adoc/modules/h2console/nav.adoc
rename to mappings/jaxrsclient/adoc/modules/jaxrsclient/nav.adoc
diff --git a/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/adoc/modules/jaxrsclient/pages/about.adoc
diff --git a/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/adoc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/mappings/restclient/src/main/adoc/antora.yml b/mappings/minio/adoc/antora.yml
similarity index 100%
rename from mappings/restclient/src/main/adoc/antora.yml
rename to mappings/minio/adoc/antora.yml
diff --git a/subdomains/zip/src/main/doc/modules/zip/nav.adoc b/mappings/minio/adoc/modules/minio/nav.adoc
similarity index 100%
rename from subdomains/zip/src/main/doc/modules/zip/nav.adoc
rename to mappings/minio/adoc/modules/minio/nav.adoc
diff --git a/mappings/minio/src/main/adoc/modules/minio/pages/about.adoc b/mappings/minio/adoc/modules/minio/pages/about.adoc
similarity index 100%
rename from mappings/minio/src/main/adoc/modules/minio/pages/about.adoc
rename to mappings/minio/adoc/modules/minio/pages/about.adoc
diff --git a/mappings/minio/src/main/adoc/modules/minio/partials/module-nav.adoc b/mappings/minio/adoc/modules/minio/partials/module-nav.adoc
similarity index 100%
rename from mappings/minio/src/main/adoc/modules/minio/partials/module-nav.adoc
rename to mappings/minio/adoc/modules/minio/partials/module-nav.adoc
diff --git a/mappings/minio/src/main/adoc/antora.yml b/mappings/restclient/adoc/antora.yml
similarity index 100%
rename from mappings/minio/src/main/adoc/antora.yml
rename to mappings/restclient/adoc/antora.yml
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc b/mappings/restclient/adoc/modules/restclient/nav.adoc
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/nav.adoc
rename to mappings/restclient/adoc/modules/restclient/nav.adoc
diff --git a/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc b/mappings/restclient/adoc/modules/restclient/pages/about.adoc
similarity index 100%
rename from mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
rename to mappings/restclient/adoc/modules/restclient/pages/about.adoc
diff --git a/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/adoc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
rename to mappings/restclient/adoc/modules/restclient/partials/module-nav.adoc
diff --git a/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc b/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
deleted file mode 100644
index 3a5d0ea..0000000
--- a/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::vro:ROOT:partial$component-nav.adoc[]
diff --git a/mappings/jaxrsclient/src/main/adoc/antora.yml b/mappings/slack/adoc/antora.yml
similarity index 100%
rename from mappings/jaxrsclient/src/main/adoc/antora.yml
rename to mappings/slack/adoc/antora.yml
diff --git a/subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc b/mappings/slack/adoc/modules/slack/nav.adoc
similarity index 100%
rename from subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc
rename to mappings/slack/adoc/modules/slack/nav.adoc
diff --git a/mappings/slack/src/main/adoc/modules/slack/pages/about.adoc b/mappings/slack/adoc/modules/slack/pages/about.adoc
similarity index 100%
rename from mappings/slack/src/main/adoc/modules/slack/pages/about.adoc
rename to mappings/slack/adoc/modules/slack/pages/about.adoc
diff --git a/mappings/slack/src/main/adoc/modules/slack/partials/module-nav.adoc b/mappings/slack/adoc/modules/slack/partials/module-nav.adoc
similarity index 100%
rename from mappings/slack/src/main/adoc/modules/slack/partials/module-nav.adoc
rename to mappings/slack/adoc/modules/slack/partials/module-nav.adoc
diff --git a/mavendeps/src/main/adoc/antora.yml b/mavendeps/adoc/antora.yml
similarity index 100%
rename from mavendeps/src/main/adoc/antora.yml
rename to mavendeps/adoc/antora.yml
diff --git a/mavendeps/src/main/adoc/modules/mavendeps/nav.adoc b/mavendeps/adoc/modules/mavendeps/nav.adoc
similarity index 100%
rename from mavendeps/src/main/adoc/modules/mavendeps/nav.adoc
rename to mavendeps/adoc/modules/mavendeps/nav.adoc
diff --git a/mavendeps/src/main/adoc/modules/mavendeps/pages/about.adoc b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
similarity index 100%
rename from mavendeps/src/main/adoc/modules/mavendeps/pages/about.adoc
rename to mavendeps/adoc/modules/mavendeps/pages/about.adoc
diff --git a/preview.sh b/preview.sh
index b9cd8a8..725446e 100644
--- a/preview.sh
+++ b/preview.sh
@@ -1,41 +1,49 @@
 #!/usr/bin/env bash
 
 PLAYBOOK_FILE=antora/playbooks/site.yml
-if [[ $# -gt 0 ]]; then
-
-  if [[ $1 == "-x" ]]; then
-    SKIP_GENERATION=true
-	shift
-  fi
-
-  if [ -f antora/playbooks/$1 ]; then
-    PLAYBOOK_FILE=$1
-  else
-    echo "no such file $PLAYBOOK_FILE - using site.yml" >&2
-  fi
-  shift
+while getopts 'ecf:aksh' opt
+do
+  case $opt in
+    e) export SKIP_EXAMPLES=true ;;
+    c) export SKIP_CONFIGS=true ;;
+    f) PLAYBOOK_FILE=$OPTARG ;;
+    a) export SKIP_GENERATION=true ;;
+    k) export SKIP_STALE_EXAMPLE_CHECK=true ;;
+    s) export SKIP_SERVE=true ;;
+    h) echo ""
+       echo "preview.sh options:"
+       echo "  -e skip examples"
+       echo "  -k skip stale example check"
+       echo "  -c skip config doc generation"
+       echo "  -a skip Antora generation"
+       echo "  -s skip serving generated site"
+       echo "  -f antora/playbooks/site-xxx.yml"
+       exit 1
+       ;;
+    *) echo "unknown option $opt - aborting" >&2
+       exit 1
+      ;;
+  esac
+done
+
+if [ ! -f $PLAYBOOK_FILE ]; then
+  echo "no such file $PLAYBOOK_FILE" >&2
+  exit 1
 fi
 
-if [[ "$SKIP_GENERATION" == "true" ]]; then
+export ANTORA_CMD=antora
 
-  echo "skipping site generation"
-
-else
-  echo "building ..."
-  export ANTORA_CMD=antora
-  export CHECK_FOR_STALE_EXAMPLES=skip
+SECONDS=0
+echo "\$PLAYBOOK_FILE = $PLAYBOOK_FILE"
+sh build-site.sh $PLAYBOOK_FILE || exit 1
 
-  SECONDS=0
-  echo "\$PLAYBOOK_FILE = $PLAYBOOK_FILE"
-  sh build-site.sh $PLAYBOOK_FILE || exit 1
 
+if [[ "$SKIP_SERVE" == "true" ]]; then
+  echo "skipping serving"
+else
+  echo ""
+  echo "http://localhost:5000"
   echo ""
-  echo "site built in ${SECONDS}s"
 
+  serve -S -p 5000 antora/target/site
 fi
-
-echo ""
-echo "http://localhost:5000"
-echo ""
-
-serve -S -p 5000 antora/target/site
diff --git a/scripts/ci/build-site.sh b/scripts/ci/build-site.sh
index 87759aa..936b04f 100644
--- a/scripts/ci/build-site.sh
+++ b/scripts/ci/build-site.sh
@@ -9,12 +9,23 @@ fi
 
 bash $SCRIPT_DIR/_print-environment.sh "build-site"
 
-bash $SCRIPT_DIR/_adoc-copy-examples.sh
-bash $SCRIPT_DIR/_adoc-gen-config.sh
+if [[ "$SKIP_EXAMPLES" == "true" ]]; then
+  echo "skipping examples"
+else
+  bash $SCRIPT_DIR/_adoc-copy-examples.sh
+fi
+
 
+if [[ "$SKIP_CONFIGS" == "true" ]]; then
+  echo "skipping config generation"
+else
+  bash $SCRIPT_DIR/_adoc-gen-config.sh
+fi
 
-# check if any examples have not been sync'd
-if [ "$CHECK_FOR_STALE_EXAMPLES" != "skip" ]; then
+
+if [ "$SKIP_STALE_EXAMPLE_CHECK" == "true" ]; then
+  echo "skipping stale example check"
+else
   WC=$(git status --porcelain | grep examples | wc -l)
   if [ "$WC" -ne "0" ]; then
     git status --porcelain
@@ -23,7 +34,13 @@ if [ "$CHECK_FOR_STALE_EXAMPLES" != "skip" ]; then
   fi
 fi
 
-bash $SCRIPT_DIR/_adoc-antora.sh $*
+if [ "$SKIP_GENERATION" == "true" ]; then
+  echo "skipping building..."
+else
+  echo "building ..."
+  bash $SCRIPT_DIR/_adoc-antora.sh $*
+  echo "site built in ${SECONDS}s"
+fi
 
 # add a marker, that tells github not to use jekyll on the github pages folder
 touch ${PROJECT_ROOT_PATH}/antora/target/site/.nojekyll
diff --git a/security/bypass/src/main/doc/antora.yml b/security/bypass/src/main/adoc/antora.yml
similarity index 100%
rename from security/bypass/src/main/doc/antora.yml
rename to security/bypass/src/main/adoc/antora.yml
diff --git a/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/security/bypass/src/main/adoc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to security/bypass/src/main/adoc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/security/bypass/src/main/doc/modules/bypass/nav.adoc b/security/bypass/src/main/adoc/modules/bypass/nav.adoc
similarity index 100%
rename from security/bypass/src/main/doc/modules/bypass/nav.adoc
rename to security/bypass/src/main/adoc/modules/bypass/nav.adoc
diff --git a/security/bypass/src/main/doc/modules/bypass/pages/about.adoc b/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
similarity index 100%
rename from security/bypass/src/main/doc/modules/bypass/pages/about.adoc
rename to security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
diff --git a/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc b/security/bypass/src/main/adoc/modules/bypass/partials/module-nav.adoc
similarity index 100%
rename from security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
rename to security/bypass/src/main/adoc/modules/bypass/partials/module-nav.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/adoc/antora.yml b/security/keycloak/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/adoc/antora.yml
rename to security/keycloak/src/main/adoc/antora.yml
diff --git a/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/nav.adoc b/security/keycloak/src/main/adoc/modules/keycloak/nav.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/nav.adoc
rename to security/keycloak/src/main/adoc/modules/keycloak/nav.adoc
diff --git a/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc b/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
similarity index 100%
rename from security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
rename to security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
diff --git a/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc b/security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc
similarity index 100%
rename from security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
rename to security/keycloak/src/main/adoc/modules/keycloak/partials/module-nav.adoc
diff --git a/extensions/security/secman/src/main/adoc/antora.yml b/security/shiro/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/security/secman/src/main/adoc/antora.yml
rename to security/shiro/src/main/adoc/antora.yml
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png b/security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
rename to security/shiro/src/main/adoc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
diff --git a/extensions/security/secman/src/main/adoc/modules/secman/nav.adoc b/security/shiro/src/main/adoc/modules/shiro/nav.adoc
similarity index 100%
rename from extensions/security/secman/src/main/adoc/modules/secman/nav.adoc
rename to security/shiro/src/main/adoc/modules/shiro/nav.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/ini-realm.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/ini-realm.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/jdbc-realm.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/jdbc-realm.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/ldap-realm.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/ldap-realm.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/run-as.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/shiro-caching.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
rename to security/shiro/src/main/adoc/modules/shiro/pages/about/shiro-caching.adoc
diff --git a/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc b/security/shiro/src/main/adoc/modules/shiro/partials/module-nav.adoc
similarity index 100%
rename from security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
rename to security/shiro/src/main/adoc/modules/shiro/partials/module-nav.adoc
diff --git a/starters/src/main/adoc/antora.yml b/starters/adoc/antora.yml
similarity index 100%
rename from starters/src/main/adoc/antora.yml
rename to starters/adoc/antora.yml
diff --git a/starters/src/main/adoc/modules/helloworld/nav.adoc b/starters/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/nav.adoc
rename to starters/adoc/modules/ROOT/nav.adoc
diff --git a/starters/src/main/adoc/modules/ROOT/pages/about.adoc b/starters/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/ROOT/pages/about.adoc
rename to starters/adoc/modules/ROOT/pages/about.adoc
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep b/starters/adoc/modules/helloworld/images/.gitkeep
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/images/.gitkeep
rename to starters/adoc/modules/helloworld/images/.gitkeep
diff --git a/starters/src/main/adoc/modules/helloworld/images/helloworld-before-launch.png b/starters/adoc/modules/helloworld/images/helloworld-before-launch.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/helloworld-before-launch.png
rename to starters/adoc/modules/helloworld/images/helloworld-before-launch.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/helloworld.png b/starters/adoc/modules/helloworld/images/helloworld.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/helloworld.png
rename to starters/adoc/modules/helloworld/images/helloworld.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/010-root-page.png b/starters/adoc/modules/helloworld/images/using-hello-world/010-root-page.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/010-root-page.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/010-root-page.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png b/starters/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/030-home-page.png b/starters/adoc/modules/helloworld/images/using-hello-world/030-home-page.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/030-home-page.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/030-home-page.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png b/starters/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png b/starters/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/060-created-object.png b/starters/adoc/modules/helloworld/images/using-hello-world/060-created-object.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/060-created-object.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/060-created-object.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/070-update-name.png b/starters/adoc/modules/helloworld/images/using-hello-world/070-update-name.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/070-update-name.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/070-update-name.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png b/starters/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png b/starters/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png b/starters/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png b/starters/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png b/starters/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png b/starters/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png b/starters/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png b/starters/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
diff --git a/starters/src/main/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png b/starters/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
rename to starters/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
diff --git a/starters/src/main/adoc/modules/ROOT/nav.adoc b/starters/adoc/modules/helloworld/nav.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/ROOT/nav.adoc
rename to starters/adoc/modules/helloworld/nav.adoc
diff --git a/starters/src/main/adoc/modules/helloworld/pages/about.adoc b/starters/adoc/modules/helloworld/pages/about.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/helloworld/pages/about.adoc
rename to starters/adoc/modules/helloworld/pages/about.adoc
diff --git a/starters/src/main/adoc/modules/simpleapp/images/dockerhub-tags.png b/starters/adoc/modules/simpleapp/images/dockerhub-tags.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/dockerhub-tags.png
rename to starters/adoc/modules/simpleapp/images/dockerhub-tags.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png b/starters/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
rename to starters/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png b/starters/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
rename to starters/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp.png b/starters/adoc/modules/simpleapp/images/simpleapp-webapp.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp.png
rename to starters/adoc/modules/simpleapp/images/simpleapp-webapp.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png b/starters/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png
rename to starters/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png b/starters/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
rename to starters/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png b/starters/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
rename to starters/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png b/starters/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
rename to starters/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png b/starters/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png
rename to starters/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx b/starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
rename to starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG b/starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
rename to starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
diff --git a/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG b/starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
rename to starters/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
diff --git a/starters/src/main/adoc/modules/simpleapp/nav.adoc b/starters/adoc/modules/simpleapp/nav.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/nav.adoc
rename to starters/adoc/modules/simpleapp/nav.adoc
diff --git a/starters/src/main/adoc/modules/simpleapp/pages/about.adoc b/starters/adoc/modules/simpleapp/pages/about.adoc
similarity index 100%
rename from starters/src/main/adoc/modules/simpleapp/pages/about.adoc
rename to starters/adoc/modules/simpleapp/pages/about.adoc
diff --git a/starters/src/main/adoc/modules/helloworld/images/.gitkeep b/starters/src/main/adoc/modules/helloworld/images/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/subdomains/zip/src/main/doc/antora.yml b/subdomains/base/adoc/antora.yml
similarity index 100%
rename from subdomains/zip/src/main/doc/antora.yml
rename to subdomains/base/adoc/antora.yml
diff --git a/subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc b/subdomains/base/adoc/modules/base/nav.adoc
similarity index 100%
rename from subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc
rename to subdomains/base/adoc/modules/base/nav.adoc
diff --git a/subdomains/base/src/main/doc/modules/base/pages/about.adoc b/subdomains/base/adoc/modules/base/pages/about.adoc
similarity index 100%
rename from subdomains/base/src/main/doc/modules/base/pages/about.adoc
rename to subdomains/base/adoc/modules/base/pages/about.adoc
diff --git a/subdomains/base/src/main/doc/modules/base/partials/module-nav.adoc b/subdomains/base/adoc/modules/base/partials/module-nav.adoc
similarity index 100%
rename from subdomains/base/src/main/doc/modules/base/partials/module-nav.adoc
rename to subdomains/base/adoc/modules/base/partials/module-nav.adoc
diff --git a/subdomains/xdocreport/src/main/doc/antora.yml b/subdomains/docx/adoc/antora.yml
similarity index 100%
rename from subdomains/xdocreport/src/main/doc/antora.yml
rename to subdomains/docx/adoc/antora.yml
diff --git a/subdomains/ognl/src/main/doc/modules/ognl/nav.adoc b/subdomains/docx/adoc/modules/docx/nav.adoc
similarity index 100%
rename from subdomains/ognl/src/main/doc/modules/ognl/nav.adoc
rename to subdomains/docx/adoc/modules/docx/nav.adoc
diff --git a/subdomains/docx/src/main/doc/modules/docx/pages/about.adoc b/subdomains/docx/adoc/modules/docx/pages/about.adoc
similarity index 100%
rename from subdomains/docx/src/main/doc/modules/docx/pages/about.adoc
rename to subdomains/docx/adoc/modules/docx/pages/about.adoc
diff --git a/subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc b/subdomains/docx/adoc/modules/docx/partials/module-nav.adoc
similarity index 100%
rename from subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc
rename to subdomains/docx/adoc/modules/docx/partials/module-nav.adoc
diff --git a/subdomains/spring/src/main/doc/antora.yml b/subdomains/excel/adoc/antora.yml
similarity index 100%
rename from subdomains/spring/src/main/doc/antora.yml
rename to subdomains/excel/adoc/antora.yml
diff --git a/subdomains/freemarker/src/main/doc/modules/freemarker/nav.adoc b/subdomains/excel/adoc/modules/excel/nav.adoc
similarity index 100%
rename from subdomains/freemarker/src/main/doc/modules/freemarker/nav.adoc
rename to subdomains/excel/adoc/modules/excel/nav.adoc
diff --git a/subdomains/excel/src/main/doc/modules/excel/pages/about.adoc b/subdomains/excel/adoc/modules/excel/pages/about.adoc
similarity index 100%
rename from subdomains/excel/src/main/doc/modules/excel/pages/about.adoc
rename to subdomains/excel/adoc/modules/excel/pages/about.adoc
diff --git a/subdomains/excel/src/main/doc/modules/excel/partials/module-nav.adoc b/subdomains/excel/adoc/modules/excel/partials/module-nav.adoc
similarity index 100%
rename from subdomains/excel/src/main/doc/modules/excel/partials/module-nav.adoc
rename to subdomains/excel/adoc/modules/excel/partials/module-nav.adoc
diff --git a/subdomains/pdfbox/src/main/doc/antora.yml b/subdomains/freemarker/adoc/antora.yml
similarity index 100%
rename from subdomains/pdfbox/src/main/doc/antora.yml
rename to subdomains/freemarker/adoc/antora.yml
diff --git a/subdomains/excel/src/main/doc/modules/excel/nav.adoc b/subdomains/freemarker/adoc/modules/freemarker/nav.adoc
similarity index 100%
rename from subdomains/excel/src/main/doc/modules/excel/nav.adoc
rename to subdomains/freemarker/adoc/modules/freemarker/nav.adoc
diff --git a/subdomains/freemarker/src/main/doc/modules/freemarker/pages/about.adoc b/subdomains/freemarker/adoc/modules/freemarker/pages/about.adoc
similarity index 100%
rename from subdomains/freemarker/src/main/doc/modules/freemarker/pages/about.adoc
rename to subdomains/freemarker/adoc/modules/freemarker/pages/about.adoc
diff --git a/subdomains/freemarker/src/main/doc/modules/freemarker/partials/module-nav.adoc b/subdomains/freemarker/adoc/modules/freemarker/partials/module-nav.adoc
similarity index 100%
rename from subdomains/freemarker/src/main/doc/modules/freemarker/partials/module-nav.adoc
rename to subdomains/freemarker/adoc/modules/freemarker/partials/module-nav.adoc
diff --git a/subdomains/ognl/src/main/doc/antora.yml b/subdomains/ognl/adoc/antora.yml
similarity index 100%
rename from subdomains/ognl/src/main/doc/antora.yml
rename to subdomains/ognl/adoc/antora.yml
diff --git a/subdomains/docx/src/main/doc/modules/docx/nav.adoc b/subdomains/ognl/adoc/modules/ognl/nav.adoc
similarity index 100%
rename from subdomains/docx/src/main/doc/modules/docx/nav.adoc
rename to subdomains/ognl/adoc/modules/ognl/nav.adoc
diff --git a/subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc b/subdomains/ognl/adoc/modules/ognl/pages/about.adoc
similarity index 100%
rename from subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc
rename to subdomains/ognl/adoc/modules/ognl/pages/about.adoc
diff --git a/subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/adoc/modules/ognl/partials/module-nav.adoc
similarity index 100%
rename from subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc
rename to subdomains/ognl/adoc/modules/ognl/partials/module-nav.adoc
diff --git a/subdomains/freemarker/src/main/doc/antora.yml b/subdomains/pdfbox/adoc/antora.yml
similarity index 100%
rename from subdomains/freemarker/src/main/doc/antora.yml
rename to subdomains/pdfbox/adoc/antora.yml
diff --git a/subdomains/base/src/main/doc/modules/base/nav.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc
similarity index 100%
rename from subdomains/base/src/main/doc/modules/base/nav.adoc
rename to subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc
diff --git a/subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/pages/about.adoc
similarity index 100%
rename from subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc
rename to subdomains/pdfbox/adoc/modules/pdfbox/pages/about.adoc
diff --git a/subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/adoc/modules/pdfbox/partials/module-nav.adoc
similarity index 100%
rename from subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc
rename to subdomains/pdfbox/adoc/modules/pdfbox/partials/module-nav.adoc
diff --git a/subdomains/excel/src/main/doc/antora.yml b/subdomains/spring/adoc/antora.yml
similarity index 100%
rename from subdomains/excel/src/main/doc/antora.yml
rename to subdomains/spring/adoc/antora.yml
diff --git a/subdomains/spring/src/main/doc/modules/spring/nav.adoc b/subdomains/spring/adoc/modules/spring/nav.adoc
similarity index 100%
rename from subdomains/spring/src/main/doc/modules/spring/nav.adoc
rename to subdomains/spring/adoc/modules/spring/nav.adoc
diff --git a/subdomains/spring/src/main/doc/modules/spring/pages/about.adoc b/subdomains/spring/adoc/modules/spring/pages/about.adoc
similarity index 100%
rename from subdomains/spring/src/main/doc/modules/spring/pages/about.adoc
rename to subdomains/spring/adoc/modules/spring/pages/about.adoc
diff --git a/subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc b/subdomains/spring/adoc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc
rename to subdomains/spring/adoc/modules/spring/partials/module-nav.adoc
diff --git a/subdomains/docx/src/main/doc/antora.yml b/subdomains/xdocreport/adoc/antora.yml
similarity index 100%
rename from subdomains/docx/src/main/doc/antora.yml
rename to subdomains/xdocreport/adoc/antora.yml
diff --git a/mappings/slack/src/main/adoc/modules/slack/nav.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/nav.adoc
similarity index 100%
rename from mappings/slack/src/main/adoc/modules/slack/nav.adoc
rename to subdomains/xdocreport/adoc/modules/xdocreport/nav.adoc
diff --git a/subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/pages/about.adoc
similarity index 100%
rename from subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc
rename to subdomains/xdocreport/adoc/modules/xdocreport/pages/about.adoc
diff --git a/subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/partials/module-nav.adoc
similarity index 100%
rename from subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc
rename to subdomains/xdocreport/adoc/modules/xdocreport/partials/module-nav.adoc
diff --git a/subdomains/base/src/main/doc/antora.yml b/subdomains/zip/adoc/antora.yml
similarity index 100%
rename from subdomains/base/src/main/doc/antora.yml
rename to subdomains/zip/adoc/antora.yml
diff --git a/mappings/minio/src/main/adoc/modules/minio/nav.adoc b/subdomains/zip/adoc/modules/zip/nav.adoc
similarity index 100%
rename from mappings/minio/src/main/adoc/modules/minio/nav.adoc
rename to subdomains/zip/adoc/modules/zip/nav.adoc
diff --git a/subdomains/zip/src/main/doc/modules/zip/pages/about.adoc b/subdomains/zip/adoc/modules/zip/pages/about.adoc
similarity index 100%
rename from subdomains/zip/src/main/doc/modules/zip/pages/about.adoc
rename to subdomains/zip/adoc/modules/zip/pages/about.adoc
diff --git a/subdomains/zip/src/main/doc/modules/zip/partials/module-nav.adoc b/subdomains/zip/adoc/modules/zip/partials/module-nav.adoc
similarity index 100%
rename from subdomains/zip/src/main/doc/modules/zip/partials/module-nav.adoc
rename to subdomains/zip/adoc/modules/zip/partials/module-nav.adoc
diff --git a/testing/unittestsupport/src/main/adoc/antora.yml b/testing/fakedata/adoc/antora.yml
similarity index 100%
rename from testing/unittestsupport/src/main/adoc/antora.yml
rename to testing/fakedata/adoc/antora.yml
diff --git a/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/nav.adoc b/testing/fakedata/adoc/modules/fakedata/nav.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/nav.adoc
rename to testing/fakedata/adoc/modules/fakedata/nav.adoc
diff --git a/testing/fakedata/src/main/adoc/modules/fakedata/pages/about.adoc b/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
similarity index 100%
rename from testing/fakedata/src/main/adoc/modules/fakedata/pages/about.adoc
rename to testing/fakedata/adoc/modules/fakedata/pages/about.adoc
diff --git a/testing/fakedata/src/main/adoc/modules/fakedata/partials/module-nav.adoc b/testing/fakedata/adoc/modules/fakedata/partials/module-nav.adoc
similarity index 100%
rename from testing/fakedata/src/main/adoc/modules/fakedata/partials/module-nav.adoc
rename to testing/fakedata/adoc/modules/fakedata/partials/module-nav.adoc
diff --git a/testing/specsupport/src/main/adoc/antora.yml b/testing/fixtures/adoc/antora.yml
similarity index 100%
rename from testing/specsupport/src/main/adoc/antora.yml
rename to testing/fixtures/adoc/antora.yml
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/composite.png b/testing/fixtures/adoc/modules/fixtures/images/composite.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/composite.png
rename to testing/fixtures/adoc/modules/fixtures/images/composite.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/flat-1.png b/testing/fixtures/adoc/modules/fixtures/images/flat-1.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/flat-1.png
rename to testing/fixtures/adoc/modules/fixtures/images/flat-1.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/flat-2.png b/testing/fixtures/adoc/modules/fixtures/images/flat-2.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/flat-2.png
rename to testing/fixtures/adoc/modules/fixtures/images/flat-2.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx b/testing/fixtures/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx
rename to testing/fixtures/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/prompt-specifying-number.png b/testing/fixtures/adoc/modules/fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/prompt-specifying-number.png
rename to testing/fixtures/adoc/modules/fixtures/images/prompt-specifying-number.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/prompt.png b/testing/fixtures/adoc/modules/fixtures/images/prompt.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/prompt.png
rename to testing/fixtures/adoc/modules/fixtures/images/prompt.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/prototyping-menu.png b/testing/fixtures/adoc/modules/fixtures/images/prototyping-menu.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/prototyping-menu.png
rename to testing/fixtures/adoc/modules/fixtures/images/prototyping-menu.png
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/images/result-list.png b/testing/fixtures/adoc/modules/fixtures/images/result-list.png
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/images/result-list.png
rename to testing/fixtures/adoc/modules/fixtures/images/result-list.png
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/nav.adoc b/testing/fixtures/adoc/modules/fixtures/nav.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/nav.adoc
rename to testing/fixtures/adoc/modules/fixtures/nav.adoc
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/pages/about.adoc b/testing/fixtures/adoc/modules/fixtures/pages/about.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/pages/about.adoc
rename to testing/fixtures/adoc/modules/fixtures/pages/about.adoc
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
rename to testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
rename to testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/partials/module-nav.adoc b/testing/fixtures/adoc/modules/fixtures/partials/module-nav.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/partials/module-nav.adoc
rename to testing/fixtures/adoc/modules/fixtures/partials/module-nav.adoc
diff --git a/testing/integtestsupport/src/main/adoc/antora.yml b/testing/h2console/adoc/antora.yml
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/antora.yml
rename to testing/h2console/adoc/antora.yml
diff --git a/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/nav.adoc b/testing/h2console/adoc/modules/h2console/nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/nav.adoc
rename to testing/h2console/adoc/modules/h2console/nav.adoc
diff --git a/testing/h2console/src/main/adoc/modules/h2console/pages/about.adoc b/testing/h2console/adoc/modules/h2console/pages/about.adoc
similarity index 100%
rename from testing/h2console/src/main/adoc/modules/h2console/pages/about.adoc
rename to testing/h2console/adoc/modules/h2console/pages/about.adoc
diff --git a/testing/h2console/src/main/adoc/modules/h2console/partials/module-nav.adoc b/testing/h2console/adoc/modules/h2console/partials/module-nav.adoc
similarity index 100%
rename from testing/h2console/src/main/adoc/modules/h2console/partials/module-nav.adoc
rename to testing/h2console/adoc/modules/h2console/partials/module-nav.adoc
diff --git a/testing/hsqldbmgr/src/main/adoc/antora.yml b/testing/hsqldbmgr/adoc/antora.yml
similarity index 100%
rename from testing/hsqldbmgr/src/main/adoc/antora.yml
rename to testing/hsqldbmgr/adoc/antora.yml
diff --git a/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/nav.adoc b/testing/hsqldbmgr/adoc/modules/hsqldbmgr/nav.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/nav.adoc
rename to testing/hsqldbmgr/adoc/modules/hsqldbmgr/nav.adoc
diff --git a/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/pages/about.adoc b/testing/hsqldbmgr/adoc/modules/hsqldbmgr/pages/about.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/pages/about.adoc
rename to testing/hsqldbmgr/adoc/modules/hsqldbmgr/pages/about.adoc
diff --git a/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/partials/module-nav.adoc b/testing/hsqldbmgr/adoc/modules/hsqldbmgr/partials/module-nav.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/partials/module-nav.adoc
rename to testing/hsqldbmgr/adoc/modules/hsqldbmgr/partials/module-nav.adoc
diff --git a/testing/h2console/src/main/adoc/antora.yml b/testing/integtestsupport/adoc/antora.yml
similarity index 100%
rename from testing/h2console/src/main/adoc/antora.yml
rename to testing/integtestsupport/adoc/antora.yml
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.png b/testing/integtestsupport/adoc/modules/integtestsupport/images/integ-tests.png
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.png
rename to testing/integtestsupport/adoc/modules/integtestsupport/images/integ-tests.png
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.pptx b/testing/integtestsupport/adoc/modules/integtestsupport/images/integ-tests.pptx
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.pptx
rename to testing/integtestsupport/adoc/modules/integtestsupport/images/integ-tests.pptx
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/wrapper-factory.png b/testing/integtestsupport/adoc/modules/integtestsupport/images/wrapper-factory.png
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/wrapper-factory.png
rename to testing/integtestsupport/adoc/modules/integtestsupport/images/wrapper-factory.png
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/nav.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/nav.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/nav.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/nav.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/about.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/about.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/abstract-class.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/abstract-class.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/abstract-class.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/abstract-class.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/bootstrapping.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/bootstrapping.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/bootstrapping.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/bootstrapping.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/configuration-properties.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/configuration-properties.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/configuration-properties.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/configuration-properties.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/maven-configuration.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/maven-configuration.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/maven-configuration.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/maven-configuration.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/typical-usage.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/typical-usage.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/typical-usage.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/typical-usage.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/wrapper-factory.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/wrapper-factory.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/wrapper-factory.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/pages/wrapper-factory.adoc
diff --git a/testing/integtestsupport/src/main/adoc/modules/integtestsupport/partials/module-nav.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/partials/module-nav.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/adoc/modules/integtestsupport/partials/module-nav.adoc
rename to testing/integtestsupport/adoc/modules/integtestsupport/partials/module-nav.adoc
diff --git a/testing/fixtures/src/main/adoc/antora.yml b/testing/specsupport/adoc/antora.yml
similarity index 100%
rename from testing/fixtures/src/main/adoc/antora.yml
rename to testing/specsupport/adoc/antora.yml
diff --git a/testing/fixtures/src/main/adoc/modules/fixtures/nav.adoc b/testing/specsupport/adoc/modules/specsupport/nav.adoc
similarity index 100%
rename from testing/fixtures/src/main/adoc/modules/fixtures/nav.adoc
rename to testing/specsupport/adoc/modules/specsupport/nav.adoc
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/pages/about.adoc b/testing/specsupport/adoc/modules/specsupport/pages/about.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/pages/about.adoc
rename to testing/specsupport/adoc/modules/specsupport/pages/about.adoc
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/pages/how-it-works.adoc b/testing/specsupport/adoc/modules/specsupport/pages/how-it-works.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/pages/how-it-works.adoc
rename to testing/specsupport/adoc/modules/specsupport/pages/how-it-works.adoc
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/pages/maven-configuration.adoc b/testing/specsupport/adoc/modules/specsupport/pages/maven-configuration.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/pages/maven-configuration.adoc
rename to testing/specsupport/adoc/modules/specsupport/pages/maven-configuration.adoc
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc b/testing/specsupport/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc
rename to testing/specsupport/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc
diff --git a/testing/specsupport/src/main/adoc/modules/specsupport/partials/module-nav.adoc b/testing/specsupport/adoc/modules/specsupport/partials/module-nav.adoc
similarity index 100%
rename from testing/specsupport/src/main/adoc/modules/specsupport/partials/module-nav.adoc
rename to testing/specsupport/adoc/modules/specsupport/partials/module-nav.adoc
diff --git a/testing/fakedata/src/main/adoc/antora.yml b/testing/unittestsupport/adoc/antora.yml
similarity index 100%
rename from testing/fakedata/src/main/adoc/antora.yml
rename to testing/unittestsupport/adoc/antora.yml
diff --git a/testing/fakedata/src/main/adoc/modules/fakedata/nav.adoc b/testing/unittestsupport/adoc/modules/unit-test-support-ext/nav.adoc
similarity index 100%
rename from testing/fakedata/src/main/adoc/modules/fakedata/nav.adoc
rename to testing/unittestsupport/adoc/modules/unit-test-support-ext/nav.adoc
diff --git a/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/pages/about.adoc b/testing/unittestsupport/adoc/modules/unit-test-support-ext/pages/about.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/pages/about.adoc
rename to testing/unittestsupport/adoc/modules/unit-test-support-ext/pages/about.adoc
diff --git a/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/adoc/modules/unit-test-support-ext/partials/module-nav.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/partials/module-nav.adoc
rename to testing/unittestsupport/adoc/modules/unit-test-support-ext/partials/module-nav.adoc
diff --git a/valuetypes/sse/src/main/adoc/antora.yml b/valuetypes/asciidoc/adoc/antora.yml
similarity index 100%
rename from valuetypes/sse/src/main/adoc/antora.yml
rename to valuetypes/asciidoc/adoc/antora.yml
diff --git a/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/nav.adoc b/valuetypes/asciidoc/adoc/modules/asciidoc/nav.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/adoc/modules/asciidoc/nav.adoc
rename to valuetypes/asciidoc/adoc/modules/asciidoc/nav.adoc
diff --git a/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/pages/about.adoc b/valuetypes/asciidoc/adoc/modules/asciidoc/pages/about.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/adoc/modules/asciidoc/pages/about.adoc
rename to valuetypes/asciidoc/adoc/modules/asciidoc/pages/about.adoc
diff --git a/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/partials/module-nav.adoc b/valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/adoc/modules/asciidoc/partials/module-nav.adoc
rename to valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc
diff --git a/valuetypes/markdown/src/main/adoc/antora.yml b/valuetypes/markdown/adoc/antora.yml
similarity index 100%
rename from valuetypes/markdown/src/main/adoc/antora.yml
rename to valuetypes/markdown/adoc/antora.yml
diff --git a/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/nav.adoc b/valuetypes/markdown/adoc/modules/markdown/nav.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/nav.adoc
rename to valuetypes/markdown/adoc/modules/markdown/nav.adoc
diff --git a/extensions/vro/cors/src/main/adoc/modules/cors/pages/about.adoc b/valuetypes/markdown/adoc/modules/markdown/pages/about.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/adoc/modules/cors/pages/about.adoc
rename to valuetypes/markdown/adoc/modules/markdown/pages/about.adoc
diff --git a/valuetypes/markdown/src/main/adoc/modules/markdown/partials/module-nav.adoc b/valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/adoc/modules/markdown/partials/module-nav.adoc
rename to valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc
diff --git a/valuetypes/asciidoc/src/main/adoc/antora.yml b/valuetypes/sse/adoc/antora.yml
similarity index 100%
rename from valuetypes/asciidoc/src/main/adoc/antora.yml
rename to valuetypes/sse/adoc/antora.yml
diff --git a/valuetypes/sse/src/main/adoc/modules/sse/nav.adoc b/valuetypes/sse/adoc/modules/sse/nav.adoc
similarity index 100%
rename from valuetypes/sse/src/main/adoc/modules/sse/nav.adoc
rename to valuetypes/sse/adoc/modules/sse/nav.adoc
diff --git a/valuetypes/sse/src/main/adoc/modules/sse/pages/about.adoc b/valuetypes/sse/adoc/modules/sse/pages/about.adoc
similarity index 100%
rename from valuetypes/sse/src/main/adoc/modules/sse/pages/about.adoc
rename to valuetypes/sse/adoc/modules/sse/pages/about.adoc
diff --git a/valuetypes/sse/src/main/adoc/modules/sse/partials/module-nav.adoc b/valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/sse/src/main/adoc/modules/sse/partials/module-nav.adoc
rename to valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/antora.yml b/viewers/restfulobjects/adoc/antora.yml
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/antora.yml
rename to viewers/restfulobjects/adoc/antora.yml
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png b/viewers/restfulobjects/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
rename to viewers/restfulobjects/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/images/rgfis/service-collaborations.png b/viewers/restfulobjects/adoc/modules/ROOT/images/rgfis/service-collaborations.png
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/images/rgfis/service-collaborations.png
rename to viewers/restfulobjects/adoc/modules/ROOT/images/rgfis/service-collaborations.png
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/nav.adoc b/viewers/restfulobjects/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/nav.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/nav.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/about.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/architecture.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/architecture.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/health-check.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/health-check.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/layout-resources.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/layout-resources.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/ro-spec.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/security.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/security.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/partials/component-nav.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..f14d3c8
--- /dev/null
+++ b/viewers/restfulobjects/adoc/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,2 @@
+* Extensions
+include::vro:cors:partial$module-nav.adoc[]
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/module-nav.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/module-nav.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/web-xml.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/web-xml.adoc
rename to viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/attachments/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore
deleted file mode 100644
index f0d619c..0000000
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/examples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-generated/*.adoc
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc
deleted file mode 100644
index ff4243f..0000000
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/pages/about.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= JAX-RS: RestEasy v4
-
-
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
deleted file mode 100644
index efa02a3..0000000
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:vro:jaxrs-resteasy-4:about.adoc[JAX-RS: RestEasy v4]
diff --git a/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/component-nav.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 75aaff8..0000000
--- a/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-include::vro:ROOT:partial$module-nav.adoc[]
-include::vro:jaxrs-resteasy-4:partial$module-nav.adoc[]
-
-* Extensions
-include::vro:cors:partial$module-nav.adoc[]
diff --git a/viewers/wicket/src/main/adoc/antora.yml b/viewers/wicket/adoc/antora.yml
similarity index 100%
rename from viewers/wicket/src/main/adoc/antora.yml
rename to viewers/wicket/adoc/antora.yml
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/about-page/about-page.png b/viewers/wicket/adoc/modules/ROOT/images/about-page/about-page.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/about-page/about-page.png
rename to viewers/wicket/adoc/modules/ROOT/images/about-page/about-page.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/dividers.png b/viewers/wicket/adoc/modules/ROOT/images/application-menu/dividers.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/dividers.png
rename to viewers/wicket/adoc/modules/ROOT/images/application-menu/dividers.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.pdn b/viewers/wicket/adoc/modules/ROOT/images/application-menu/layout-menus.pdn
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.pdn
rename to viewers/wicket/adoc/modules/ROOT/images/application-menu/layout-menus.pdn
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.png b/viewers/wicket/adoc/modules/ROOT/images/application-menu/layout-menus.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.png
rename to viewers/wicket/adoc/modules/ROOT/images/application-menu/layout-menus.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/tertiary.png b/viewers/wicket/adoc/modules/ROOT/images/application-menu/tertiary.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/tertiary.png
rename to viewers/wicket/adoc/modules/ROOT/images/application-menu/tertiary.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/060-download-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/060-download-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/060-download.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/060-download.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png b/viewers/wicket/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
rename to viewers/wicket/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png b/viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png b/viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png b/viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
rename to viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel.png b/viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel.png
rename to viewers/wicket/adoc/modules/ROOT/images/bookmarked-pages/panel.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png b/viewers/wicket/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
rename to viewers/wicket/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo.png b/viewers/wicket/adoc/modules/ROOT/images/brand-logo/brand-logo.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo.png
rename to viewers/wicket/adoc/modules/ROOT/images/brand-logo/brand-logo.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints-940.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/030-hints-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/030-hints-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/030-hints.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/030-hints.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url-940.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/050-title-url-940.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url-940.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/050-title-url-940.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url.png b/viewers/wicket/adoc/modules/ROOT/images/copy-link/050-title-url.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url.png
rename to viewers/wicket/adoc/modules/ROOT/images/copy-link/050-title-url.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/modal.png b/viewers/wicket/adoc/modules/ROOT/images/dialog-mode/modal.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/modal.png
rename to viewers/wicket/adoc/modules/ROOT/images/dialog-mode/modal.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/sidebar.png b/viewers/wicket/adoc/modules/ROOT/images/dialog-mode/sidebar.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/sidebar.png
rename to viewers/wicket/adoc/modules/ROOT/images/dialog-mode/sidebar.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-footer.png b/viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-footer.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-footer.png
rename to viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-footer.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png b/viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
rename to viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header.png b/viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-header.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header.png
rename to viewers/wicket/adoc/modules/ROOT/images/embedded-view/no-header.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/regular.png b/viewers/wicket/adoc/modules/ROOT/images/embedded-view/regular.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/regular.png
rename to viewers/wicket/adoc/modules/ROOT/images/embedded-view/regular.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png b/viewers/wicket/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
rename to viewers/wicket/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/viewers/wicket/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to viewers/wicket/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png b/viewers/wicket/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to viewers/wicket/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png b/viewers/wicket/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
rename to viewers/wicket/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/customer-order.png b/viewers/wicket/adoc/modules/ROOT/images/layouts/customer-order.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/customer-order.png
rename to viewers/wicket/adoc/modules/ROOT/images/layouts/customer-order.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Invoice.png b/viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-Invoice.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Invoice.png
rename to viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-Invoice.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Lease.png b/viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-Lease.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Lease.png
rename to viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-Lease.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png b/viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
rename to viewers/wicket/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png b/viewers/wicket/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
rename to viewers/wicket/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/010-download.png b/viewers/wicket/adoc/modules/ROOT/images/menubars/010-download.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/010-download.png
rename to viewers/wicket/adoc/modules/ROOT/images/menubars/010-download.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/020-download.png b/viewers/wicket/adoc/modules/ROOT/images/menubars/020-download.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/020-download.png
rename to viewers/wicket/adoc/modules/ROOT/images/menubars/020-download.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout.css b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/isis-layout.css
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout.css
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/isis-layout.css
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html b/viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
rename to viewers/wicket/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/login-page-default.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/login-page-default.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png b/viewers/wicket/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to viewers/wicket/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-1.png b/viewers/wicket/adoc/modules/ROOT/images/theme-chooser/example-1.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-1.png
rename to viewers/wicket/adoc/modules/ROOT/images/theme-chooser/example-1.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-2.png b/viewers/wicket/adoc/modules/ROOT/images/theme-chooser/example-2.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-2.png
rename to viewers/wicket/adoc/modules/ROOT/images/theme-chooser/example-2.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/login-page-default.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-page.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-page.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-page.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-page.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png b/viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
rename to viewers/wicket/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png b/viewers/wicket/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
rename to viewers/wicket/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
diff --git a/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/nav.adoc b/viewers/wicket/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/nav.adoc
rename to viewers/wicket/adoc/modules/ROOT/nav.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/about.adoc b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/about.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/about.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/about-page.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/about-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/about-page.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/about-page.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/brand-logo.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/brand-logo.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/brand-logo.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/brand-logo.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/request-parameters.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/request-parameters.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/request-parameters.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/request-parameters.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/welcome-page.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/welcome-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/welcome-page.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/customisation/welcome-page.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/extending.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-pages.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-pages.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/extending/custom-pages.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/blob-attachments.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/blob-attachments.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/blob-attachments.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/blob-attachments.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/recent-pages.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/recent-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/recent-pages.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/recent-pages.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/titles-in-tables.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/titles-in-tables.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/titles-in-tables.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/titles-in-tables.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/user-registration.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/user-registration.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/user-registration.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/user-registration.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/where-am-i.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/features/where-am-i.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/incode-platform.adoc b/viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/incode-platform.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout.adoc b/viewers/wicket/adoc/modules/ROOT/pages/layout.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/layout.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/layout.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/annotation-based.adoc b/viewers/wicket/adoc/modules/ROOT/pages/layout/annotation-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/annotation-based.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/layout/annotation-based.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/file-based.adoc b/viewers/wicket/adoc/modules/ROOT/pages/layout/file-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/file-based.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/layout/file-based.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/table-columns.adoc b/viewers/wicket/adoc/modules/ROOT/pages/layout/table-columns.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/table-columns.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/layout/table-columns.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout.adoc b/viewers/wicket/adoc/modules/ROOT/pages/menubars-layout.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/menubars-layout.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc b/viewers/wicket/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc b/viewers/wicket/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/pages/security.adoc b/viewers/wicket/adoc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/pages/security.adoc
rename to viewers/wicket/adoc/modules/ROOT/pages/security.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/partials/component-nav.adoc b/viewers/wicket/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/partials/component-nav.adoc
rename to viewers/wicket/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/partials/module-nav.adoc b/viewers/wicket/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/partials/module-nav.adoc
rename to viewers/wicket/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/partials/security/pages.adoc b/viewers/wicket/adoc/modules/ROOT/partials/security/pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/partials/security/pages.adoc
rename to viewers/wicket/adoc/modules/ROOT/partials/security/pages.adoc
diff --git a/viewers/wicket/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc b/viewers/wicket/adoc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from viewers/wicket/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/wicket/adoc/modules/ROOT/partials/security/user-registration.adoc