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 2019/10/08 06:52:36 UTC
[isis] 02/04: ISIS-2062: uses simplified antora 2.x directory
structure (remove 'assets' dir)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c5b44e4648c0429de89c105f96710011cd1954e5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 8 07:06:12 2019 +0100
ISIS-2062: uses simplified antora 2.x directory structure (remove 'assets' dir)
---
antora/components/archdesign/modules/ROOT/_attributes.adoc | 4 ++--
.../archdesign/modules/ROOT/attachments}/.gitkeep | 0
.../components/archdesign/modules/ROOT/images}/.gitkeep | 0
antora/components/mignotes/modules/ROOT/_attributes.adoc | 4 ++--
.../components/mignotes/modules/ROOT/attachments}/.gitkeep | 0
.../components/mignotes/modules/ROOT/images}/.gitkeep | 0
antora/components/refguide/modules/ROOT/_attributes.adoc | 4 ++--
antora/components/relnotes/modules/ROOT/_attributes.adoc | 4 ++--
.../components/relnotes/modules/ROOT/attachments}/.gitkeep | 0
.../components/relnotes/modules/ROOT/images}/.gitkeep | 0
antora/components/testing/modules/ROOT/_attributes.adoc | 4 ++--
.../components/testing/modules/ROOT/attachments}/.gitkeep | 0
.../components/testing/modules/ROOT/images}/.gitkeep | 0
antora/components/toc/modules/ROOT/_attributes.adoc | 4 ++--
.../components/toc/modules/ROOT/attachments}/.gitkeep | 0
.../ROOT/{assets => }/images/going-deeper/books/dhnako.jpg | Bin
.../images/going-deeper/books/nakedobjects-book.jpg | Bin
.../modules/ROOT/{assets => }/images/more-thanks/ecp.png | Bin
.../ROOT/{assets => }/images/more-thanks/ecp_logo_white.png | Bin
.../{assets => }/images/more-thanks/ej-technologies.png | Bin
.../ROOT/{assets => }/images/more-thanks/icons8-logo.png | Bin
.../ROOT/{assets => }/images/more-thanks/s101_170.png | Bin
.../toc/modules/ROOT/{assets => }/images/tv_show-25.png | Bin
.../what-is-apache-isis/isis-in-pictures/010-login.png | Bin
.../isis-in-pictures/020-install-fixtures.png | Bin
.../isis-in-pictures/030-dashboard-view-model.png | Bin
.../isis-in-pictures/040-domain-entity.png | Bin
.../isis-in-pictures/050-edit-property.png | Bin
.../isis-in-pictures/060-invoke-action.png | Bin
.../isis-in-pictures/065-contributions.png | Bin
.../isis-in-pictures/067-contributed-action.png | Bin
.../isis-in-pictures/070-pluggable-views.png | Bin
.../what-is-apache-isis/isis-in-pictures/080-gmap3-view.png | Bin
.../isis-in-pictures/090-fullcalendar2-view.png | Bin
.../isis-in-pictures/100-excel-view-and-docx.png | Bin
.../what-is-apache-isis/isis-in-pictures/110-docx.png | Bin
.../what-is-apache-isis/isis-in-pictures/120-auditing.png | Bin
.../what-is-apache-isis/isis-in-pictures/130-security.png | Bin
.../what-is-apache-isis/isis-in-pictures/140-i18n.png | Bin
.../isis-in-pictures/150-appsettings.png | Bin
.../isis-in-pictures/160-switch-tenancy.png | Bin
.../images/what-is-apache-isis/isis-in-pictures/170-me.png | Bin
.../isis-in-pictures/180-app-user-entity.png | Bin
.../isis-in-pictures/190-switch-theme.png | Bin
.../what-is-apache-isis/isis-in-pictures/200-rest-api.png | Bin
.../what-is-apache-isis/isis-in-pictures/205-swagger-ui.png | Bin
.../isis-in-pictures/210-fixture-scripts.png | Bin
.../isis-in-pictures/220-testing-happy-case.png | Bin
.../isis-in-pictures/230-testing-wrapper-factory.png | Bin
.../isis-in-pictures/240-domain-events.png | Bin
.../isis-in-pictures/250-domain-event-subscriber.png | Bin
.../isis-in-pictures/260-domain-event-test.png | Bin
.../what-is-apache-isis/powered-by/commapp/screenshot-1.png | Bin
.../what-is-apache-isis/powered-by/commapp/screenshot-2.png | Bin
.../what-is-apache-isis/powered-by/cqnz/cqnz-advert.png | Bin
.../powered-by/estatio/est-home-page.png | Bin
.../what-is-apache-isis/powered-by/estatio/est-invoice.png | Bin
.../powered-by/estatio/est-payment-batch-manager.png | Bin
.../what-is-apache-isis/powered-by/estatio/estatio-1.png | Bin
.../powered-by/gesconsultor-grc/fig-1-custom-viewer.png | Bin
.../gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png | Bin
.../fig-3-custom-ui-analyzing-risk-scenarios.png | Bin
.../powered-by/gesconsultor-grc/fig-4-managing-projects.png | Bin
.../powered-by/transportplanner/TransportDemand.png | Bin
antora/components/toc/modules/comguide/_attributes.adoc | 4 ++--
.../components/toc/modules/comguide}/attachments/.gitkeep | 0
.../{assets => }/images/committers/github-pr-history.png | Bin
.../{assets => }/images/docker/020-docker-nat-public.png | Bin
.../images/docker/022-local-security-policy.png | Bin
.../images/docker/024-unidentified-are-private.png | Bin
.../{assets => }/images/docker/026-docker-nat-private.png | Bin
.../comguide/{assets => }/images/docker/docker-daemon.png | Bin
.../images/release-process/jira-create-release-notes.png | Bin
.../{assets => }/images/release-process/nexus-release-1.png | Bin
.../{assets => }/images/release-process/nexus-staging-0.png | Bin
.../{assets => }/images/release-process/nexus-staging-1.png | Bin
.../{assets => }/images/release-process/nexus-staging-2.png | Bin
.../images/release-process/nexus-staging-2a.png | Bin
.../{assets => }/images/release-process/nexus-staging-3.png | Bin
.../{assets => }/images/release-process/nexus-staging-4.png | Bin
antora/components/toc/modules/devguide/_attributes.adoc | 4 ++--
.../attachments/asciidoc-syntax-quick-reference.pdf | Bin
.../{assets => }/attachments/asciidoc-writers-guide.pdf | Bin
.../attachments/eclipse/Apache-Isis-code-style-cleanup.xml | 0
.../attachments/eclipse/Apache-code-style-formatting.xml | 0
.../attachments/eclipse/Apache-code-style-template.xml | 0
.../{assets => }/attachments/eclipse/isis-templates.xml | 0
.../{assets => }/attachments/eclipse/isis.importorder | 0
.../{assets => }/attachments/eclipse/jmock2-templates.xml | 0
.../{assets => }/attachments/eclipse/junit4-templates.xml | 0
.../devguide/{assets => }/attachments/intellij/.gitignore | 0
.../attachments/intellij/isis-settings-file-templates.jar | Bin
.../{assets => }/attachments/intellij/other/.gitignore | 0
.../attachments/intellij/other/dan-settings-keymaps.jar | Bin
.../{assets => }/attachments/resources/IsisCheatSheet.docx | Bin
.../{assets => }/attachments/resources/IsisCheatSheet.pdf | Bin
.../devguide/{assets => }/images/asciidoctor/ditaa-demo.png | Bin
.../{assets => }/images/asciidoctor/graphviz-demo.png | Bin
.../{assets => }/images/asciidoctor/plantuml-demo.png | Bin
.../images/building-apache-isis/setting-up-git.png | Bin
.../{assets => }/images/contributing/git-workflow.png | Bin
.../{assets => }/images/contributing/git-workflow.pptx | Bin
.../{assets => }/images/contributing/github-cloning.png | Bin
.../{assets => }/images/contributing/github-forking.png | Bin
.../images/eclipse/2017-oxygen/010-lombok-locate-jar.png | Bin
.../eclipse/2017-oxygen/020-lombok-install-into-eclipse.png | Bin
.../2017-oxygen/030-datanucleus-install-new-software.png | Bin
.../2017-oxygen/040-datanucleus-specify-repository.png | Bin
.../eclipse/2017-oxygen/050-datanucleus-select-plugin.png | Bin
.../eclipse/2017-oxygen/060-enable-annotation-processor.png | Bin
.../images/eclipse/eclipse-010-windows-preferences.png | Bin
.../images/eclipse/eclipse-025-project-properties.png | Bin
.../images/eclipse/eclipse-100-project-support.png | Bin
.../images/eclipse/eclipse-110-project-support.png | Bin
.../{assets => }/images/eclipse/eclipse-120-console.png | Bin
.../eclipse/eclipse-200-enhancer-fails-duplicates.png | Bin
.../eclipse/eclipse-210-enhancer-fails-duplicates.png | Bin
.../eclipse/eclipse-220-enhancer-fails-duplicates.png | Bin
.../intellij-idea/010-installing/010-welcome-page.png | Bin
.../intellij-idea/010-installing/020-choose-location.png | Bin
.../010-installing/030-installation-options.png | Bin
.../intellij-idea/010-installing/040-start-menu-folder.png | Bin
.../images/intellij-idea/010-installing/050-completing.png | Bin
.../010-installing/060-import-settings-or-not.png | Bin
.../intellij-idea/010-installing/070-set-ui-theme.png | Bin
.../020-create-new-project/010-new-project-create.png | Bin
.../020-create-new-project/020-java-project-setup-jdk.png | Bin
.../020-create-new-project/030-java-project-select-jdk.png | Bin
.../020-create-new-project/040-sdk-selected.png | Bin
.../020-create-new-project/050-name-and-location.png | Bin
.../intellij-idea/020-create-new-project/060-create-dir.png | Bin
.../030-import-settings/010-settings-import-jar.png | Bin
.../intellij-idea/030-import-settings/020-select-all.png | Bin
.../intellij-idea/030-import-settings/030-restart.png | Bin
.../030-import-settings/040-file-templates.png | Bin
.../030-import-settings/050-live-templates.png | Bin
.../040-other-settings-compiler/010-build-automatically.png | Bin
.../020-annotation-processor.png | Bin
.../042-other-settings-maven/010-maven-installation.png | Bin
.../042-other-settings-maven/020-maven-configuration.png | Bin
.../044-other-settings-misc/010-auto-import.png | Bin
.../intellij-idea/050-some-plugins/010-some-plugins.png | Bin
.../050-some-plugins/020-some-plugins-confirmation.png | Bin
.../050-some-plugins/maven-helper/010-dependency-tab.png | Bin
.../maven-helper/020-dependency-as-tree.png | Bin
.../050-some-plugins/maven-helper/030-maven-run-goal.png | Bin
.../050-some-plugins/maven-helper/040-maven-quick-run.png | Bin
.../060-troubleshooting/010-duplicate-classes.png | Bin
.../intellij-idea/070-advanced/002-compiler-exclude.png | Bin
.../images/intellij-idea/070-advanced/004-gradle-output.png | Bin
.../images/intellij-idea/070-advanced/005-gradle-output.png | Bin
.../images/intellij-idea/070-advanced/006-livereload-js.png | Bin
.../010-dcevm-list-of-found-jdk-installations.png | Bin
.../intellij-idea/070-advanced/020-dcevm-once-installed.png | Bin
.../070-advanced/030-dcevm-intellij-project-structure.png | Bin
.../070-advanced/040-dcevm-run-configuration.png | Bin
.../100-maven-module-mgmt/010-maven-modules-view.png | Bin
.../100-maven-module-mgmt/020-adding-another-module.png | Bin
.../100-maven-module-mgmt/030-other-module-added.png | Bin
.../100-maven-module-mgmt/040-ignoring-modules.png | Bin
.../100-maven-module-mgmt/050-ignoring-modules-2.png | Bin
.../100-maven-module-mgmt/060-ignored-modules.png | Bin
.../110-running-the-app/010-run-configuration.png | Bin
.../110-running-the-app/020-datanucleus-enhancer-goal.png | Bin
.../110-running-the-app/030-running-unit-tests.png | Bin
.../040-running-unit-tests-run-configuration.png | Bin
.../050-running-integration-tests-run-configuration.png | Bin
.../200-project-sdk/010-file-project-structure.png | Bin
.../images/intellij-idea/200-project-sdk/020-select-jdk.png | Bin
.../200-project-sdk/030-select-jdk-directory.png | Bin
.../intellij-idea/200-project-sdk/040-set-project-level.png | Bin
.../200-project-sdk/050-isis-language-level-7.png | Bin
.../200-project-sdk/060-app-language-level-8.png | Bin
.../intellij-idea/250-new-project/010-new-project.png | Bin
.../intellij-idea/250-new-project/020-new-project-name.png | Bin
.../250-new-project/030-new-project-new-window.png | Bin
.../040-new-module-from-existing-sources.png | Bin
.../250-new-project/050-specify-source-folder.png | Bin
.../250-new-project/060-import-using-maven.png | Bin
.../250-new-project/070-import-module-settings.png | Bin
.../intellij-idea/250-new-project/080-maven-profiles.png | Bin
.../intellij-idea/250-new-project/090-maven-coordinates.png | Bin
.../250-new-project/100-annotation-processing.png | Bin
.../images/intellij-idea/250-new-project/110-parameter8.png | Bin
.../250-new-project/120-clean-generate-sources.png | Bin
.../300-paraname8-support/010-configuring-the-compiler.png | Bin
.../run-debug-configuration-single-module.png | Bin
.../toc/modules/devguide}/images/layouts/estatio-Lease.png | Bin
.../{assets => }/images/resources/IsisCheatSheet.png | Bin
.../components/toc/modules/module-template/_attributes.adoc | 4 ++--
.../toc/modules/module-template/attachments}/.gitkeep | 0
.../components/toc/modules/module-template/images}/.gitkeep | 0
antora/components/userguide/modules/ROOT/_attributes.adoc | 6 +++---
antora/components/userguide/modules/btb/_attributes.adoc | 4 ++--
.../components/userguide/modules/btb/attachments}/.gitkeep | 0
.../images/headless-access/BackgroundCommandExecution.png | Bin
...roundCommandExecutionFromBackgroundCommandServiceJdo.png | Bin
.../images/hints-and-tips/action-semantics-are-you-sure.png | Bin
.../images/hints-and-tips/are-you-sure-happy-case.png | Bin
.../images/hints-and-tips/are-you-sure-sad-case.png | Bin
.../btb/{assets => }/images/hints-and-tips/are-you-sure.png | Bin
.../{assets => }/images/hints-and-tips/view-model-fail.png | Bin
.../images/hints-and-tips/view-model-success.png | Bin
.../modules/btb/{assets => }/images/runtime/web-xml/key.png | Bin
.../btb/{assets => }/images/runtime/web-xml/parts.pptx | Bin
.../btb/{assets => }/images/runtime/web-xml/ro-only.png | Bin
.../{assets => }/images/runtime/web-xml/wicket-and-ro.png | Bin
.../btb/{assets => }/images/runtime/web-xml/wicket-only.png | Bin
antora/components/userguide/modules/fun/_attributes.adoc | 4 ++--
.../core-concepts/Pawson-Naked-Objects-thesis.pdf | Bin
.../images/core-concepts/philosophy/build-vs-buy.png | Bin
.../images/core-concepts/philosophy/build-vs-buy.pptx | Bin
.../core-concepts/philosophy/decoupled-applications.png | Bin
.../core-concepts/philosophy/decoupled-applications.pptx | Bin
.../philosophy/hexagonal-architecture-addons.png | Bin
.../core-concepts/philosophy/hexagonal-architecture.png | Bin
.../core-concepts/philosophy/hexagonal-architecture.pptx | Bin
.../images/programming-model/todoapp-Dashboard.png | Bin
core/applib/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
core/applib/_adoc/modules/ant/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/ant}/attachments/.gitkeep | 0
.../applib/_adoc/modules/ant}/images/.gitkeep | 0
.../reference-annotations/ActionLayout}/bookmarking.png | Bin
.../reference-annotations/ActionLayout/position-BELOW.png | Bin
.../reference-annotations/ActionLayout/position-PANEL.png | Bin
.../ActionLayout/position-PANEL_DROPDOWN.png | Bin
.../reference-annotations/ActionLayout/position-RIGHT.png | Bin
.../CollectionLayout/sortedby-dependencies.png | Bin
.../DomainObjectLayout/bookmarking-nested.png | Bin
.../DomainObjectLayout}/bookmarking.png | Bin
.../DomainServiceLayout/menuBar-primary.png | Bin
.../DomainServiceLayout/menuBar-secondary.png | Bin
.../DomainServiceLayout/menuBar-tertiary.png | Bin
.../reference-annotations/DomainServiceLayout/menuOrder.png | Bin
.../images/reference-annotations/HomePage/HomePage.png | Bin
.../PropertyLayout/labelPosition-LEFT.png | Bin
.../PropertyLayout/labelPosition-NONE.png | Bin
.../PropertyLayout/labelPosition-TOP.png | Bin
.../PropertyLayout/labelPosition-boolean-LEFT.png | Bin
.../PropertyLayout/labelPosition-boolean-RIGHT.png | Bin
core/applib/_adoc/modules/cms/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/cms}/attachments/.gitkeep | 0
.../cms}/images/reference-classes/issue-in-more-detail.png | Bin
.../images/reference-methods/prefixes/choices/dependent.png | Bin
.../reference-methods/reserved/cssClass/strikethrough.png | Bin
.../reference-methods/reserved/iconName/differing.pdn | Bin
.../reference-methods/reserved/iconName/differing.png | Bin
.../reference-methods/reserved/iconName/png-files.png | Bin
.../_adoc/modules/cms}/images/value-types/markup.png | Bin
core/applib/_adoc/modules/svc/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/svc/attachments}/.gitkeep | 0
.../images/reference-services-api/acceptheaderservice.png | Bin
.../images/reference-services-api/acceptheaderservice.pptx | Bin
.../ErrorReportingService/kitchensink-example.png | Bin
.../action-invocation-published-to-stderr.png | Bin
.../EventSerializer/changed-object-published-to-stderr.png | Bin
.../PublishingService/yuml.me-23db58a4.png | Bin
.../reference-services-spi/UserProfileService/todoapp.png | Bin
.../{assets => }/images/reference-services/categories.png | Bin
.../{assets => }/images/reference-services/categories.pptx | Bin
.../images/reference-services/commands-and-events.png | Bin
.../images/reference-services/commands-and-events.pptx | Bin
core/config/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../config/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../config/_adoc/modules/ROOT}/images/.gitkeep | 0
core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../plugins/jdo/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../images/hints-n-tips/diagnosing-n-plus-1.png | Bin
.../party-agreementrole-agreement.png | Bin
core/runtime-services/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../images/ContentNegotiationService/accept-json.png | Bin
.../images/ContentNegotiationService/accept-xml.png | Bin
.../images/ContentNegotiationService/facade-choices.png | Bin
.../images/ContentNegotiationService/facade-choices.pptx | Bin
.../RepresentationService}/service-collaborations.png | Bin
.../RepresentationService/service-collaborations.pptx | Bin
core/schema/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../schema/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../ROOT}/images/reference-classes/issue-in-more-detail.png | Bin
.../images/reference-methods/prefixes/choices/dependent.png | Bin
.../reference-methods/reserved/cssClass/strikethrough.png | Bin
.../reference-methods/reserved/iconName/differing.pdn | Bin
.../reference-methods/reserved/iconName/differing.png | Bin
.../reference-methods/reserved/iconName/png-files.png | Bin
.../_adoc/modules/ROOT}/images/value-types/markup.png | Bin
core/security/api/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../ROOT/{assets => }/attachments/security-apis-impl.pptx | Bin
.../security/api/_adoc/modules/ROOT}/images/.gitkeep | 0
core/security/bypass/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../bypass/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../security-apis-impl/configure-isis-to-use-bypass.PNG | Bin
core/security/shiro/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../security/shiro/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../configuring-shiro/ldap}/activeds-ldap-groups.png | Bin
.../ldap}/activeds-ldap-mojo-partition.png | Bin
.../configuring-shiro/ldap}/activeds-ldap-mojo-root-dse.png | Bin
.../ldap}/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap}/activeds-ldap-users.png | Bin
.../security-apis-impl/configure-isis-to-use-shiro.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../security-apis-impl/configure-shiro-to-use-ini-realm.PNG | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../shiro/_adoc/modules/realm-jdbc/_attributes.adoc | 4 ++--
.../shiro/_adoc/modules/realm-jdbc}/attachments/.gitkeep | 0
.../images}/configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../shiro/_adoc/modules/realm-ldap/_attributes.adoc | 4 ++--
.../shiro/_adoc/modules/realm-ldap/attachments}/.gitkeep | 0
.../ldap => realm-ldap/images}/activeds-ldap-groups.png | Bin
.../images}/activeds-ldap-mojo-partition.png | Bin
.../images}/activeds-ldap-mojo-root-dse.png | Bin
.../images}/activeds-ldap-sasl-authentication.png | Bin
.../ldap => realm-ldap/images}/activeds-ldap-users.png | Bin
.../images}/configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../integtestsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../_adoc/modules/ROOT/{assets => }/images/integ-tests.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/integ-tests.pptx | Bin
.../modules/ROOT/{assets => }/images/wrapper-factory.png | Bin
.../integtestsupport/_adoc/modules/mvn/_attributes.adoc | 4 ++--
.../_adoc/modules/mvn/attachments}/.gitkeep | 0
.../mvn/{assets => }/images/maven-plugin/xsd-goal.png | Bin
.../mvn/{assets => }/images/maven-plugin/xsd-goal.pptx | Bin
.../unittestsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../unittestsupport/_adoc/modules/ROOT}/images/.gitkeep | 0
.../_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../ro-spec-resources-and-representations.png | Bin
.../modules/ROOT/images/rgfis}/service-collaborations.png | Bin
.../_adoc/modules/security/_attributes.adoc | 4 ++--
.../_adoc/modules/security/attachments}/.gitkeep | 0
.../_adoc/modules/security/images}/.gitkeep | 0
core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/{assets => }/attachments/.gitkeep | 0
.../ROOT/{assets => }/images/about-page/about-page.png | Bin
.../ROOT/{assets => }/images/application-menu/dividers.png | Bin
.../{assets => }/images/application-menu/layout-menus.pdn | Bin
.../{assets => }/images/application-menu/layout-menus.png | Bin
.../ROOT/{assets => }/images/application-menu/tertiary.png | Bin
.../images/blob-attachments/010-attachment-field-940.png | Bin
.../images/blob-attachments/010-attachment-field.png | Bin
.../images/blob-attachments/020-edit-choose-file-940.png | Bin
.../images/blob-attachments/020-edit-choose-file.png | Bin
.../blob-attachments/030-choose-file-using-browser-520.png | Bin
.../blob-attachments/030-choose-file-using-browser.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated-940.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered-940.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered.png | Bin
.../images/blob-attachments/060-download-940.png | Bin
.../{assets => }/images/blob-attachments/060-download.png | Bin
.../images/blob-attachments/070-edit-clear-940.png | Bin
.../{assets => }/images/blob-attachments/070-edit-clear.png | Bin
.../ROOT/{assets => }/images/bookmarked-pages/panel-940.png | Bin
.../images/bookmarked-pages/panel-estatio-940.png | Bin
.../{assets => }/images/bookmarked-pages/panel-estatio.png | Bin
.../ROOT/{assets => }/images/bookmarked-pages/panel.png | Bin
.../{assets => }/images/brand-logo/brand-logo-signin.png | Bin
.../ROOT/{assets => }/images/brand-logo/brand-logo.png | Bin
.../images/copy-link/010-copy-link-button-940.png | Bin
.../{assets => }/images/copy-link/010-copy-link-button.png | Bin
.../images/copy-link/020-copy-link-dialog-940.png | Bin
.../{assets => }/images/copy-link/020-copy-link-dialog.png | Bin
.../ROOT/{assets => }/images/copy-link/030-hints-940.png | Bin
.../ROOT/{assets => }/images/copy-link/030-hints.png | Bin
.../images/copy-link/040-copy-link-with-hints-940.png | Bin
.../images/copy-link/040-copy-link-with-hints.png | Bin
.../{assets => }/images/copy-link/050-title-url-940.png | Bin
.../ROOT/{assets => }/images/copy-link/050-title-url.png | Bin
.../modules/ROOT/{assets => }/images/dialog-mode/modal.png | Bin
.../ROOT/{assets => }/images/dialog-mode/sidebar.png | Bin
.../ROOT/{assets => }/images/embedded-view/no-footer.png | Bin
.../images/embedded-view/no-header-no-footer.png | Bin
.../ROOT/{assets => }/images/embedded-view/no-header.png | Bin
.../ROOT/{assets => }/images/embedded-view/regular.png | Bin
.../images/features/recent-pages/recent-pages.png | Bin
.../ui-hints/object-titles-and-icons/cust-order-product.png | Bin
.../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../{assets => }/images/layout-dynamic-xml/ToDoItem.png | Bin
.../ROOT/{assets => }/images/layouts/customer-order.png | Bin
.../ROOT/{assets => }/images/layouts/estatio-Invoice.png | Bin
.../_adoc/modules/ROOT}/images/layouts/estatio-Lease.png | Bin
.../ROOT/{assets => }/images/layouts/estatio-LeaseItem.png | Bin
.../ROOT/{assets => }/images/layouts/todoapp-ToDoItem.png | Bin
.../ROOT/{assets => }/images/menubars/010-download.png | Bin
.../ROOT/{assets => }/images/menubars/020-download.png | Bin
.../ROOT/{assets => }/images/reference-layout/4-0-8-0.png | Bin
.../ROOT/{assets => }/images/reference-layout/4-4-4-12.png | Bin
.../ROOT/{assets => }/images/reference-layout/6-6-0-12.png | Bin
.../images/reference-layout/isis-layout-show-facets.css | 0
.../{assets => }/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
.../suppress-password-reset}/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
.../images/suppress-sign-up/login-page-suppress-sign-up.png | Bin
.../ROOT/{assets => }/images/theme-chooser/example-1.png | Bin
.../ROOT/{assets => }/images/theme-chooser/example-2.png | Bin
.../user-registration}/login-page-default.png | Bin
.../images/user-registration/sign-up-after-registration.png | Bin
.../sign-up-email-with-verification-link.png | Bin
.../user-registration/sign-up-login-page-after-sign-up.png | Bin
.../{assets => }/images/user-registration/sign-up-page.png | Bin
.../images/user-registration/sign-up-registration-page.png | Bin
.../ROOT/{assets => }/images/where-am-i/hello_grey_bg.png | Bin
core/viewer-wicket/_adoc/modules/security/_attributes.adoc | 4 ++--
.../_adoc/modules/security/attachments}/.gitkeep | 0
.../_adoc/modules/security/images}/.gitkeep | 0
examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../apps/helloworld/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../helloworld/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../apps/helloworld/_adoc/modules/ROOT}/images/.gitkeep | 0
.../ROOT/{assets => }/images/helloworld-before-launch.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/helloworld.png | Bin
.../{assets => }/images/using-hello-world/010-root-page.png | Bin
.../images/using-hello-world/020-login-to-wicket-viewer.png | Bin
.../{assets => }/images/using-hello-world/030-home-page.png | Bin
.../using-hello-world/040-create-object-from-menu.png | Bin
.../050-create-object-from-menu-prompt.png | Bin
.../images/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
.../images/using-hello-world/100-object-deleted.png | Bin
.../using-hello-world/200-swagger-ui-before-reload.png | Bin
.../images/using-hello-world/210-helloworld-resources.png | Bin
.../using-hello-world/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
examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../modules/ROOT/{assets => }/images/dockerhub-tags.png | Bin
.../{assets => }/images/simpleapp-webapp-before-launch.png | Bin
.../{assets => }/images/simpleapp-webapp-with-fixtures.png | Bin
.../modules/ROOT/{assets => }/images/simpleapp-webapp.png | Bin
.../{assets => }/images/using-simple-app/030-home-page.png | Bin
.../images/using-simple-app/040-run-fixture-script-menu.png | Bin
.../using-simple-app/050-run-fixture-script-prompt.png | Bin
.../using-simple-app/060-run-fixture-script-result.png | Bin
.../{assets => }/images/using-simple-app/070-home-page.png | Bin
.../images/using-simple-app/structure/structure.pptx | Bin
.../images/using-simple-app/structure/structure/Slide1.PNG | Bin
.../images/using-simple-app/structure/structure/Slide2.PNG | Bin
examples/smoketests/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../smoketests/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../smoketests/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../asciidoc/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../asciidoc/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../fixtures/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../fixtures/_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/{assets => }/images/composite.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/flat-1.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/flat-2.png | Bin
.../{assets => }/images/organizing-fixture-scripts.pptx | Bin
.../ROOT/{assets => }/images/prompt-specifying-number.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/prompt.png | Bin
.../modules/ROOT/{assets => }/images/prototyping-menu.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/result-list.png | Bin
extensions/incubator/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../incubator/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../incubator/_adoc/modules/ROOT}/images/.gitkeep | 0
extensions/markdown/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../markdown/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../markdown/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/secman/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../secman/_adoc/modules/ROOT}/images/.gitkeep | 0
extensions/secman/_adoc/modules/api/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/api}/attachments/.gitkeep | 0
.../secman/_adoc/modules/api/images}/.gitkeep | 0
.../_adoc/modules/encryption-jbcrypt/_attributes.adoc | 4 ++--
.../_adoc/modules/encryption-jbcrypt}/attachments/.gitkeep | 0
.../_adoc/modules/encryption-jbcrypt}/images/.gitkeep | 0
extensions/secman/_adoc/modules/model/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/model}/attachments/.gitkeep | 0
.../secman/_adoc/modules/model/images}/.gitkeep | 0
.../secman/_adoc/modules/persistence-jdo/_attributes.adoc | 4 ++--
.../_adoc/modules/persistence-jdo/attachments}/.gitkeep | 0
.../secman/_adoc/modules/persistence-jdo/images}/.gitkeep | 0
.../secman/_adoc/modules/realm-shiro/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/realm-shiro}/attachments/.gitkeep | 0
.../secman/_adoc/modules/realm-shiro/images}/.gitkeep | 0
...isisaddons-security-module-realm-with-delegate-realm.PNG | Bin
...figure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../specsupport/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../specsupport/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/sse/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../sse/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../sse/_adoc/modules/ROOT/images}/.gitkeep | 0
.../viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../viewer-wicket-excel/_adoc/modules/ROOT/images}/.gitkeep | 0
mavendeps/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT/images}/.gitkeep | 0
503 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/antora/components/archdesign/modules/ROOT/_attributes.adoc b/antora/components/archdesign/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/archdesign/modules/ROOT/_attributes.adoc
+++ b/antora/components/archdesign/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/mavendeps/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/archdesign/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/archdesign/modules/ROOT/attachments/.gitkeep
diff --git a/mavendeps/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/archdesign/modules/ROOT/images/.gitkeep
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/archdesign/modules/ROOT/images/.gitkeep
diff --git a/antora/components/mignotes/modules/ROOT/_attributes.adoc b/antora/components/mignotes/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/mignotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/mignotes/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/mignotes/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/mignotes/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/mignotes/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/mignotes/modules/ROOT/images/.gitkeep
diff --git a/antora/components/refguide/modules/ROOT/_attributes.adoc b/antora/components/refguide/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/refguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/_attributes.adoc b/antora/components/relnotes/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/relnotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/relnotes/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/relnotes/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/relnotes/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/sse/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/relnotes/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/relnotes/modules/ROOT/images/.gitkeep
diff --git a/antora/components/testing/modules/ROOT/_attributes.adoc b/antora/components/testing/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/testing/modules/ROOT/_attributes.adoc
+++ b/antora/components/testing/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/testing/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/testing/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/testing/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/testing/modules/ROOT/images/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/toc/modules/ROOT/_attributes.adoc
index 8249db3..43cb529 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
-:imagesdir: {moduledir}/assets/images
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/.gitkeep b/antora/components/toc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/.gitkeep
rename to antora/components/toc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/assets/images/going-deeper/books/dhnako.jpg b/antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/going-deeper/books/dhnako.jpg
rename to antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
diff --git a/antora/components/toc/modules/ROOT/assets/images/going-deeper/books/nakedobjects-book.jpg b/antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/going-deeper/books/nakedobjects-book.jpg
rename to antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp.png b/antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp_logo_white.png b/antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp_logo_white.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ej-technologies.png b/antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ej-technologies.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/icons8-logo.png b/antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/icons8-logo.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/s101_170.png b/antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/s101_170.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/tv_show-25.png b/antora/components/toc/modules/ROOT/images/tv_show-25.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/tv_show-25.png
rename to antora/components/toc/modules/ROOT/images/tv_show-25.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/010-login.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/010-login.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/065-contributions.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/110-docx.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/110-docx.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/120-auditing.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/130-security.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/130-security.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/140-i18n.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/170-me.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/170-me.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-home-page.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-invoice.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/estatio-1.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
diff --git a/antora/components/toc/modules/comguide/_attributes.adoc b/antora/components/toc/modules/comguide/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/comguide/_attributes.adoc
+++ b/antora/components/toc/modules/comguide/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/attachments/.gitkeep b/antora/components/toc/modules/comguide/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/attachments/.gitkeep
rename to antora/components/toc/modules/comguide/attachments/.gitkeep
diff --git a/antora/components/toc/modules/comguide/assets/images/committers/github-pr-history.png b/antora/components/toc/modules/comguide/images/committers/github-pr-history.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/committers/github-pr-history.png
rename to antora/components/toc/modules/comguide/images/committers/github-pr-history.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/020-docker-nat-public.png b/antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/020-docker-nat-public.png
rename to antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/022-local-security-policy.png b/antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/022-local-security-policy.png
rename to antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/024-unidentified-are-private.png b/antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/024-unidentified-are-private.png
rename to antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/026-docker-nat-private.png b/antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/026-docker-nat-private.png
rename to antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/docker-daemon.png b/antora/components/toc/modules/comguide/images/docker/docker-daemon.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/docker-daemon.png
rename to antora/components/toc/modules/comguide/images/docker/docker-daemon.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/jira-create-release-notes.png b/antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/jira-create-release-notes.png
rename to antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-release-1.png b/antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-release-1.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-0.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-0.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-1.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-1.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2a.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2a.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-3.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-3.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-4.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-4.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png
diff --git a/antora/components/toc/modules/devguide/_attributes.adoc b/antora/components/toc/modules/devguide/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/devguide/_attributes.adoc
+++ b/antora/components/toc/modules/devguide/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/devguide/assets/attachments/asciidoc-syntax-quick-reference.pdf b/antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/asciidoc-syntax-quick-reference.pdf
rename to antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
diff --git a/antora/components/toc/modules/devguide/assets/attachments/asciidoc-writers-guide.pdf b/antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/asciidoc-writers-guide.pdf
rename to antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-Isis-code-style-cleanup.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-formatting.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-formatting.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-template.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-template.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/isis-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/isis-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/isis.importorder b/antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/isis.importorder
rename to antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/jmock2-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/jmock2-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/junit4-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/junit4-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/.gitignore b/antora/components/toc/modules/devguide/attachments/intellij/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/.gitignore
rename to antora/components/toc/modules/devguide/attachments/intellij/.gitignore
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/isis-settings-file-templates.jar b/antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/isis-settings-file-templates.jar
rename to antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/other/.gitignore b/antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/other/.gitignore
rename to antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/other/dan-settings-keymaps.jar b/antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/other/dan-settings-keymaps.jar
rename to antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
diff --git a/antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.docx b/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.docx
rename to antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
diff --git a/antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.pdf b/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.pdf
rename to antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/ditaa-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/ditaa-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/graphviz-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/graphviz-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/plantuml-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/plantuml-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/building-apache-isis/setting-up-git.png b/antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/building-apache-isis/setting-up-git.png
rename to antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.png b/antora/components/toc/modules/devguide/images/contributing/git-workflow.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.png
rename to antora/components/toc/modules/devguide/images/contributing/git-workflow.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.pptx b/antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.pptx
rename to antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/github-cloning.png b/antora/components/toc/modules/devguide/images/contributing/github-cloning.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/github-cloning.png
rename to antora/components/toc/modules/devguide/images/contributing/github-cloning.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/github-forking.png b/antora/components/toc/modules/devguide/images/contributing/github-forking.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/github-forking.png
rename to antora/components/toc/modules/devguide/images/contributing/github-forking.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/010-lombok-locate-jar.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/060-enable-annotation-processor.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-010-windows-preferences.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-010-windows-preferences.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-025-project-properties.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-025-project-properties.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-100-project-support.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-100-project-support.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-110-project-support.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-110-project-support.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-120-console.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-120-console.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-200-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-210-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-220-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/010-welcome-page.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/010-welcome-page.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/020-choose-location.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/020-choose-location.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/030-installation-options.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/030-installation-options.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/040-start-menu-folder.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/040-start-menu-folder.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/050-completing.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/050-completing.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/060-import-settings-or-not.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/060-import-settings-or-not.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/070-set-ui-theme.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/070-set-ui-theme.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/010-new-project-create.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/010-new-project-create.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/040-sdk-selected.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/040-sdk-selected.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/050-name-and-location.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/050-name-and-location.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/060-create-dir.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/060-create-dir.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/010-settings-import-jar.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/010-settings-import-jar.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/020-select-all.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/020-select-all.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/030-restart.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/030-restart.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/040-file-templates.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/040-file-templates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/050-live-templates.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/050-live-templates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png b/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png b/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/010-maven-installation.png b/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/044-other-settings-misc/010-auto-import.png b/antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/044-other-settings-misc/010-auto-import.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/010-some-plugins.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/010-some-plugins.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png b/antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/002-compiler-exclude.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/002-compiler-exclude.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/004-gradle-output.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/004-gradle-output.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/005-gradle-output.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/005-gradle-output.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/006-livereload-js.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/006-livereload-js.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/020-dcevm-once-installed.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/010-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/010-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/030-running-unit-tests.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/010-file-project-structure.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/010-file-project-structure.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/020-select-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/020-select-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/040-set-project-level.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/040-set-project-level.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/060-app-language-level-8.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/010-new-project.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/010-new-project.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/020-new-project-name.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/020-new-project-name.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/030-new-project-new-window.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/030-new-project-new-window.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/050-specify-source-folder.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/050-specify-source-folder.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/060-import-using-maven.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/060-import-using-maven.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/070-import-module-settings.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/070-import-module-settings.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/080-maven-profiles.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/080-maven-profiles.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/090-maven-coordinates.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/090-maven-coordinates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/100-annotation-processing.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/100-annotation-processing.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/110-parameter8.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/110-parameter8.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/120-clean-generate-sources.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/120-clean-generate-sources.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png b/antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png b/antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png b/antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
rename to antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png
diff --git a/antora/components/toc/modules/devguide/assets/images/resources/IsisCheatSheet.png b/antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/resources/IsisCheatSheet.png
rename to antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png
diff --git a/antora/components/toc/modules/module-template/_attributes.adoc b/antora/components/toc/modules/module-template/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/module-template/_attributes.adoc
+++ b/antora/components/toc/modules/module-template/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/assets/images/.gitkeep b/antora/components/toc/modules/module-template/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/persistence-jdo/assets/images/.gitkeep
rename to antora/components/toc/modules/module-template/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/assets/attachments/.gitkeep b/antora/components/toc/modules/module-template/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/persistence-jdo/assets/attachments/.gitkeep
rename to antora/components/toc/modules/module-template/images/.gitkeep
diff --git a/antora/components/userguide/modules/ROOT/_attributes.adoc b/antora/components/userguide/modules/ROOT/_attributes.adoc
index 787e5c4..43cb529 100644
--- a/antora/components/userguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/userguide/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/btb/_attributes.adoc b/antora/components/userguide/modules/btb/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/userguide/modules/btb/_attributes.adoc
+++ b/antora/components/userguide/modules/btb/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/assets/images/.gitkeep b/antora/components/userguide/modules/btb/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/model/assets/images/.gitkeep
rename to antora/components/userguide/modules/btb/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
diff --git a/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png b/antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-fail.png b/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-fail.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
diff --git a/antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-success.png b/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-success.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx b/antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/ro-only.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/ro-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-only.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
diff --git a/antora/components/userguide/modules/fun/_attributes.adoc b/antora/components/userguide/modules/fun/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/userguide/modules/fun/_attributes.adoc
+++ b/antora/components/userguide/modules/fun/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png b/antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
rename to antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
diff --git a/core/applib/_adoc/modules/ROOT/_attributes.adoc b/core/applib/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/_attributes.adoc b/core/applib/_adoc/modules/ant/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/ant/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/assets/attachments/.gitkeep b/core/applib/_adoc/modules/ant/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/model/assets/attachments/.gitkeep
rename to core/applib/_adoc/modules/ant/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/assets/images/.gitkeep b/core/applib/_adoc/modules/ant/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/encryption-jbcrypt/assets/images/.gitkeep
rename to core/applib/_adoc/modules/ant/images/.gitkeep
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/bookmarking.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/bookmarking.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-BELOW.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-BELOW.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-RIGHT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-RIGHT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png b/core/applib/_adoc/modules/ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png b/core/applib/_adoc/modules/ant/images/reference-annotations/HomePage/HomePage.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/HomePage/HomePage.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
diff --git a/core/applib/_adoc/modules/cms/_attributes.adoc b/core/applib/_adoc/modules/cms/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/cms/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/assets/attachments/.gitkeep b/core/applib/_adoc/modules/cms/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/encryption-jbcrypt/assets/attachments/.gitkeep
rename to core/applib/_adoc/modules/cms/attachments/.gitkeep
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-classes/issue-in-more-detail.png b/core/applib/_adoc/modules/cms/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-classes/issue-in-more-detail.png
rename to core/applib/_adoc/modules/cms/images/reference-classes/issue-in-more-detail.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/prefixes/choices/dependent.png b/core/applib/_adoc/modules/cms/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/prefixes/choices/dependent.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/cssClass/strikethrough.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/cssClass/strikethrough.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.pdn b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.pdn
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/png-files.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/png-files.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/value-types/markup.png b/core/applib/_adoc/modules/cms/images/value-types/markup.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/value-types/markup.png
rename to core/applib/_adoc/modules/cms/images/value-types/markup.png
diff --git a/core/applib/_adoc/modules/svc/_attributes.adoc b/core/applib/_adoc/modules/svc/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/svc/_attributes.adoc
+++ b/core/applib/_adoc/modules/svc/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/assets/images/.gitkeep b/core/applib/_adoc/modules/svc/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/api/assets/images/.gitkeep
rename to core/applib/_adoc/modules/svc/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.png b/core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.png
rename to core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx b/core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.pptx
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/UserProfileService/todoapp.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/UserProfileService/todoapp.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/categories.png b/core/applib/_adoc/modules/svc/images/reference-services/categories.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/categories.png
rename to core/applib/_adoc/modules/svc/images/reference-services/categories.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/categories.pptx b/core/applib/_adoc/modules/svc/images/reference-services/categories.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/categories.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services/categories.pptx
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.png b/core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.png
rename to core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.pptx b/core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.pptx
diff --git a/core/config/_adoc/modules/ROOT/_attributes.adoc b/core/config/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/config/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/assets/attachments/.gitkeep b/core/config/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/api/assets/attachments/.gitkeep
rename to core/config/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep b/core/config/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/config/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/plugins/jdo/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/plugins/jdo/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png b/core/plugins/jdo/_adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png
rename to core/plugins/jdo/_adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/core/plugins/jdo/_adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
rename to core/plugins/jdo/_adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep b/core/runtime-services/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/runtime-services/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-json.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-xml.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.pptx
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png b/core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png
rename to core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx b/core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx
rename to core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.pptx
diff --git a/core/schema/_adoc/modules/ROOT/_attributes.adoc b/core/schema/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/schema/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/schema/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/schema/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-classes/issue-in-more-detail.png b/core/schema/_adoc/modules/ROOT/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-classes/issue-in-more-detail.png
rename to core/schema/_adoc/modules/ROOT/images/reference-classes/issue-in-more-detail.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/value-types/markup.png b/core/schema/_adoc/modules/ROOT/images/value-types/markup.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/value-types/markup.png
rename to core/schema/_adoc/modules/ROOT/images/value-types/markup.png
diff --git a/core/security/api/_adoc/modules/ROOT/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/api/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/api/_adoc/modules/ROOT/assets/attachments/security-apis-impl.pptx b/core/security/api/_adoc/modules/ROOT/attachments/security-apis-impl.pptx
similarity index 100%
rename from core/security/api/_adoc/modules/ROOT/assets/attachments/security-apis-impl.pptx
rename to core/security/api/_adoc/modules/ROOT/attachments/security-apis-impl.pptx
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/api/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/api/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/bypass/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/bypass/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/bypass/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/bypass/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/shiro/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/shiro/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-groups.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-groups.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-partition.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-partition.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-root-dse.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-root-dse.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-sasl-authentication.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-sasl-authentication.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-users.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-users.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-shiro.png
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/assets/images/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-jdbc/assets/images/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/shiro/_adoc/modules/realm-jdbc/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/shiro/_adoc/modules/realm-jdbc/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/shiro/_adoc/modules/realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/shiro/_adoc/modules/realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/shiro/_adoc/modules/realm-ldap/attachments/.gitkeep
similarity index 100%
rename from extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/shiro/_adoc/modules/realm-ldap/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-groups.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-users.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/shiro/_adoc/modules/realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/shiro/_adoc/modules/realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.png b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.png
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.pptx b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.pptx
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/wrapper-factory.png b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/wrapper-factory.png
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/assets/images/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep
similarity index 100%
rename from examples/smoketests/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.png b/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.png
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx b/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from examples/smoketests/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/images/rgfis/service-collaborations.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/images/rgfis/service-collaborations.png
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/security/assets/images/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/security/attachments/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/security/assets/images/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/security/attachments/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/security/assets/attachments/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/security/images/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/security/assets/attachments/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/security/images/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/about-page/about-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/about-page/about-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/dividers.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/dividers.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.pdn
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.pdn
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/tertiary.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/tertiary.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png b/core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png b/core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png b/core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/modal.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/modal.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png b/core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/sidebar.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/sidebar.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-footer.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-footer.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/regular.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/regular.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png b/core/viewer-wicket/_adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/core/viewer-wicket/_adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/customer-order.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/customer-order.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Invoice.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Invoice.png
diff --git a/antora/components/toc/modules/devguide/assets/images/layouts/estatio-Lease.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Lease.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/layouts/estatio-Lease.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Lease.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/menubars/010-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/menubars/010-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/menubars/020-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/menubars/020-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout.css
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout.css
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png b/core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-1.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-1.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png b/core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-2.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-2.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png b/core/viewer-wicket/_adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
diff --git a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/assets/images/.gitkeep b/core/viewer-wicket/_adoc/modules/security/attachments/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/security/assets/images/.gitkeep
rename to core/viewer-wicket/_adoc/modules/security/attachments/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/security/images/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/security/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/security/images/.gitkeep
diff --git a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep b/examples/apps/helloworld/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to examples/apps/helloworld/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/examples/apps/helloworld/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/.gitkeep
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld-before-launch.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld-before-launch.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld-before-launch.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld-before-launch.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/010-root-page.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/010-root-page.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/010-root-page.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/010-root-page.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/020-login-to-wicket-viewer.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/020-login-to-wicket-viewer.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/020-login-to-wicket-viewer.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/020-login-to-wicket-viewer.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/030-home-page.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/030-home-page.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/030-home-page.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/030-home-page.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/040-create-object-from-menu.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/040-create-object-from-menu.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/040-create-object-from-menu.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/040-create-object-from-menu.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/050-create-object-from-menu-prompt.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/050-create-object-from-menu-prompt.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/050-create-object-from-menu-prompt.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/050-create-object-from-menu-prompt.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/060-created-object.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/060-created-object.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/060-created-object.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/060-created-object.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/070-update-name.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/070-update-name.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/070-update-name.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/070-update-name.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/080-edit-notes.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/080-edit-notes.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/080-edit-notes.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/080-edit-notes.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/090-delete-object.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/090-delete-object.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/090-delete-object.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/090-delete-object.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/100-object-deleted.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/100-object-deleted.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/100-object-deleted.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/100-object-deleted.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/200-swagger-ui-before-reload.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/200-swagger-ui-before-reload.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/200-swagger-ui-before-reload.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/200-swagger-ui-before-reload.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/210-helloworld-resources.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/210-helloworld-resources.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/210-helloworld-resources.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/210-helloworld-resources.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/220-create-object-thru-rest-api.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/220-create-object-thru-rest-api.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/220-create-object-thru-rest-api.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/220-create-object-thru-rest-api.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/230-create-object-thru-rest-api-response.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/230-create-object-thru-rest-api-response.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/230-create-object-thru-rest-api-response.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/230-create-object-thru-rest-api-response.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/240-retrieve-object-using-rest-api.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/240-retrieve-object-using-rest-api.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/240-retrieve-object-using-rest-api.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/240-retrieve-object-using-rest-api.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/250-retrieve-object-using-rest-api-response.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/dockerhub-tags.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/dockerhub-tags.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/dockerhub-tags.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/dockerhub-tags.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-before-launch.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-before-launch.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-before-launch.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-before-launch.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-with-fixtures.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-with-fixtures.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-with-fixtures.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-with-fixtures.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/030-home-page.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/030-home-page.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/030-home-page.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/030-home-page.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/040-run-fixture-script-menu.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/040-run-fixture-script-menu.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/040-run-fixture-script-menu.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/040-run-fixture-script-menu.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/050-run-fixture-script-prompt.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/050-run-fixture-script-prompt.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/050-run-fixture-script-prompt.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/050-run-fixture-script-prompt.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/060-run-fixture-script-result.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/060-run-fixture-script-result.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/060-run-fixture-script-result.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/060-run-fixture-script-result.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/070-home-page.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/070-home-page.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/070-home-page.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/070-home-page.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure.pptx b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure.pptx
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure.pptx
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure.pptx
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide1.PNG b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide1.PNG
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide1.PNG
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide1.PNG
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide2.PNG b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide2.PNG
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide2.PNG
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide2.PNG
diff --git a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/examples/smoketests/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to examples/smoketests/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/attachments/.gitkeep b/examples/smoketests/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/attachments/.gitkeep
rename to examples/smoketests/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/attachments/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/attachments/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/assets/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-jdbc/assets/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/composite.png b/extensions/fixtures/_adoc/modules/ROOT/images/composite.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/composite.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/composite.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-1.png b/extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-1.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-2.png b/extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-2.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/organizing-fixture-scripts.pptx b/extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/organizing-fixture-scripts.pptx
rename to extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt-specifying-number.png b/extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt-specifying-number.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt.png b/extensions/fixtures/_adoc/modules/ROOT/images/prompt.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prompt.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prototyping-menu.png b/extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prototyping-menu.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/result-list.png b/extensions/fixtures/_adoc/modules/ROOT/images/result-list.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/result-list.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/result-list.png
diff --git a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/incubator/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/api/_adoc/modules/ROOT/assets/images/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/api/_adoc/modules/ROOT/assets/images/.gitkeep
rename to extensions/incubator/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/schema/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/config/_adoc/modules/ROOT/assets/images/.gitkeep b/extensions/secman/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/config/_adoc/modules/ROOT/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/api/_attributes.adoc b/extensions/secman/_adoc/modules/api/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/api/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/api/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/config/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/api/attachments/.gitkeep
similarity index 100%
rename from core/config/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/api/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/svc/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/api/images/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/api/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/cms/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/encryption-jbcrypt/attachments/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/encryption-jbcrypt/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/ant/assets/images/.gitkeep b/extensions/secman/_adoc/modules/encryption-jbcrypt/images/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/encryption-jbcrypt/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/model/_attributes.adoc b/extensions/secman/_adoc/modules/model/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/model/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/model/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/model/attachments/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/model/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/btb/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/model/images/.gitkeep
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/model/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/module-template/assets/images/.gitkeep b/extensions/secman/_adoc/modules/persistence-jdo/attachments/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/module-template/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/persistence-jdo/attachments/.gitkeep
diff --git a/antora/components/toc/modules/module-template/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/persistence-jdo/images/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/module-template/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/persistence-jdo/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/comguide/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/realm-shiro/attachments/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/realm-shiro/attachments/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/realm-shiro/images/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/realm-shiro/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/testing/modules/ROOT/assets/images/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/testing/modules/ROOT/assets/images/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/testing/modules/ROOT/assets/attachments/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/assets/images/.gitkeep b/extensions/sse/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/assets/images/.gitkeep
rename to extensions/sse/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/relnotes/modules/ROOT/assets/attachments/.gitkeep b/extensions/sse/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/sse/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/mignotes/modules/ROOT/assets/images/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/mignotes/modules/ROOT/assets/images/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/mignotes/modules/ROOT/assets/attachments/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/mignotes/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/images/.gitkeep
diff --git a/mavendeps/_adoc/modules/ROOT/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/mavendeps/_adoc/modules/ROOT/_attributes.adoc
+++ b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/archdesign/modules/ROOT/assets/images/.gitkeep b/mavendeps/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/archdesign/modules/ROOT/assets/images/.gitkeep
rename to mavendeps/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/archdesign/modules/ROOT/assets/attachments/.gitkeep b/mavendeps/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/archdesign/modules/ROOT/assets/attachments/.gitkeep
rename to mavendeps/_adoc/modules/ROOT/images/.gitkeep