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/09/18 06:32:32 UTC

[isis] 12/13: ISIS-2062: moves ug alongside code, renamed to _adoc-ug

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

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

commit 9c52630acad985027d18c6d8dbb936bdfee5dfce
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:30:28 2019 +0200

    ISIS-2062: moves ug alongside code, renamed to _adoc-ug
---
 {antora/components/ug => core/_adoc-ug}/antora.yml          |   2 +-
 {antora/components/ug => core/_adoc-ug}/examples.csv        |   0
 .../fun => core/_adoc-ug/modules/ROOT}/_attributes.adoc     |   0
 .../components/ug => core/_adoc-ug}/modules/ROOT/nav.adoc   |   0
 .../_adoc-ug/modules/ROOT}/pages/_attributes.adoc           |   0
 .../_adoc-ug/modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../ug => core/_adoc-ug}/modules/ROOT/pages/about.adoc      |   0
 .../ug => core/_adoc-ug}/modules/btb/_attributes.adoc       |   0
 .../_adoc-ug/modules/btb/assets/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
 .../assets/images/hints-and-tips/are-you-sure-sad-case.png  | Bin
 .../btb/assets/images/hints-and-tips/are-you-sure.png       | Bin
 .../btb/assets/images/hints-and-tips/view-model-fail.png    | Bin
 .../btb/assets/images/hints-and-tips/view-model-success.png | Bin
 .../modules/btb/assets/images/runtime/web-xml/key.png       | Bin
 .../modules/btb/assets/images/runtime/web-xml/parts.pptx    | Bin
 .../modules/btb/assets/images/runtime/web-xml/ro-only.png   | Bin
 .../btb/assets/images/runtime/web-xml/wicket-and-ro.png     | Bin
 .../btb/assets/images/runtime/web-xml/wicket-only.png       | Bin
 .../ug => core/_adoc-ug}/modules/btb/examples/.gitkeep      |   0
 .../components/ug => core/_adoc-ug}/modules/btb/nav.adoc    |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/_attributes.adoc |   0
 .../_adoc-ug/modules/btb/pages/_partials}/_attributes.adoc  |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/about.adoc       |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/deployment.adoc  |   0
 .../_adoc-ug/modules/btb/pages/deployment}/_attributes.adoc |   0
 .../_adoc-ug}/modules/btb/pages/deployment/cmd-line.adoc    |   0
 .../_adoc-ug}/modules/btb/pages/deployment/docker.adoc      |   0
 .../btb/pages/deployment/externalized-configuration.adoc    |   0
 .../_adoc-ug}/modules/btb/pages/deployment/gae.adoc         |   0
 .../_adoc-ug}/modules/btb/pages/deployment/jvm-flags.adoc   |   0
 .../_adoc-ug}/modules/btb/pages/deployment/neo4j.adoc       |   0
 .../_adoc-ug}/modules/btb/pages/deployment/tomcat.adoc      |   0
 .../_adoc-ug}/modules/btb/pages/headless-access.adoc        |   0
 .../pages/headless-access/AbstractIsisSessionTemplate.adoc  |   0
 .../pages/headless-access/BackgroundCommandExecution.adoc   |   0
 .../modules/btb/pages/headless-access}/_attributes.adoc     |   0
 .../_adoc-ug}/modules/btb/pages/hints-and-tips.adoc         |   0
 .../modules/btb/pages/hints-and-tips}/_attributes.adoc      |   0
 .../modules/btb/pages/hints-and-tips/are-you-sure.adoc      |   0
 .../hints-and-tips/how-to-handle-void-and-null-results.adoc |   0
 .../hints-and-tips/how-to-implement-a-spellchecker.adoc     |   0
 .../modules/btb/pages/hints-and-tips/multi-tenancy.adoc     |   0
 .../modules/btb/pages/hints-and-tips/persisted-title.adoc   |   0
 .../modules/btb/pages/hints-and-tips/pushing-changes.adoc   |   0
 .../replacing-default-service-implementations.adoc          |   0
 .../hints-and-tips/simulating-collections-of-values.adoc    |   0
 .../pages/hints-and-tips/subclass-properties-in-tables.adoc |   0
 .../btb/pages/hints-and-tips/transactions-and-errors.adoc   |   0
 .../btb/pages/hints-and-tips/vetoing-visibility.adoc        |   0
 .../btb/pages/hints-and-tips/view-model-instantiation.adoc  |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/i18n.adoc        |   0
 .../_adoc-ug}/modules/btb/pages/other-techniques.adoc       |   0
 .../_adoc-ug}/modules/btb/pages/programming-model.adoc      |   0
 .../modules/btb/pages/programming-model}/_attributes.adoc   |   0
 .../btb/pages/programming-model/custom-validator.adoc       |   0
 .../modules/btb/pages/programming-model/finetuning.adoc     |   0
 .../ug => core/_adoc-ug}/modules/btb/pages/web-xml.adoc     |   0
 .../ROOT => core/_adoc-ug/modules/fun}/_attributes.adoc     |   0
 .../core-concepts/Pawson-Naked-Objects-thesis.pdf           | Bin
 .../assets/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
 .../assets/images/programming-model/todoapp-Dashboard.png   | Bin
 .../_adoc-ug/modules/fun/examples}/.gitkeep                 |   0
 .../components/ug => core/_adoc-ug}/modules/fun/nav.adoc    |   0
 .../_adoc-ug/modules/fun}/pages/_attributes.adoc            |   0
 .../_adoc-ug/modules/fun/pages/_partials}/_attributes.adoc  |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/about.adoc       |   0
 .../modules/fun/pages/available-domain-services.adoc        |   0
 .../fun/pages/available-domain-services}/_attributes.adoc   |   0
 .../pages/available-domain-services/framework-provided.adoc |   0
 .../pages/available-domain-services/incode-platform.adoc    |   0
 .../_adoc-ug}/modules/fun/pages/building-blocks.adoc        |   0
 .../modules/fun/pages/building-blocks}/_attributes.adoc     |   0
 .../_adoc-ug}/modules/fun/pages/building-blocks/events.adoc |   0
 .../fun/pages/building-blocks/events}/_attributes.adoc      |   0
 .../fun/pages/building-blocks/events/domain-events.adoc     |   0
 .../fun/pages/building-blocks/events/lifecycle-events.adoc  |   0
 .../modules/fun/pages/building-blocks/events/ui-events.adoc |   0
 .../modules/fun/pages/building-blocks/identifiers.adoc      |   0
 .../fun/pages/building-blocks/identifiers}/_attributes.adoc |   0
 .../modules/fun/pages/building-blocks/identifiers/oid.adoc  |   0
 .../identifiers/title-and-icon-and-css-class.adoc           |   0
 .../modules/fun/pages/building-blocks/metamodel.adoc        |   0
 .../modules/fun/pages/building-blocks/modules.adoc          |   0
 .../modules/fun/pages/building-blocks/object-members.adoc   |   0
 .../fun/pages/building-blocks/types-of-domain-objects.adoc  |   0
 .../types-of-domain-objects}/_attributes.adoc               |   0
 .../types-of-domain-objects/domain-entities.adoc            |   0
 .../types-of-domain-objects/domain-services.adoc            |   0
 .../building-blocks/types-of-domain-objects/mixins.adoc     |   0
 .../types-of-domain-objects/view-models.adoc                |   0
 .../_adoc-ug}/modules/fun/pages/business-rules.adoc         |   0
 .../modules/fun/pages/business-rules}/_attributes.adoc      |   0
 .../_adoc-ug}/modules/fun/pages/business-rules/actions.adoc |   0
 .../modules/fun/pages/business-rules/side-effects.adoc      |   0
 .../modules/fun/pages/business-rules/usability.adoc         |   0
 .../modules/fun/pages/business-rules/validity.adoc          |   0
 .../modules/fun/pages/business-rules/visibility.adoc        |   0
 .../_adoc-ug}/modules/fun/pages/core-concepts.adoc          |   0
 .../modules/fun/pages/core-concepts}/_attributes.adoc       |   0
 .../modules/fun/pages/core-concepts/apache-isis-vs.adoc     |   0
 .../pages/core-concepts/apache-isis-vs}/_attributes.adoc    |   0
 .../fun/pages/core-concepts/apache-isis-vs/cqrs.adoc        |   0
 .../pages/core-concepts/apache-isis-vs/event-sourcing.adoc  |   0
 .../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc |   0
 .../modules/fun/pages/core-concepts/deployment-options.adoc |   0
 .../modules/fun/pages/core-concepts/philosophy.adoc         |   0
 .../fun/pages/core-concepts/philosophy/_attributes.adoc     |   0
 .../modules/fun/pages/core-concepts/philosophy/aop.adoc     |   0
 .../modules/fun/pages/core-concepts/philosophy/dci.adoc     |   0
 .../core-concepts/philosophy/domain-driven-design.adoc      |   0
 .../core-concepts/philosophy/hexagonal-architecture.adoc    |   0
 .../fun/pages/core-concepts/philosophy/how-eases-ddd.adoc   |   0
 .../core-concepts/philosophy/naked-objects-pattern.adoc     |   0
 .../modules/fun/pages/core-concepts/principles.adoc         |   0
 .../fun/pages/core-concepts/principles}/_attributes.adoc    |   0
 .../fun/pages/core-concepts/principles/build-not-buy.adoc   |   0
 .../pages/core-concepts/principles/for-the-long-term.adoc   |   0
 .../fun/pages/core-concepts/principles/isis-itself.adoc     |   0
 .../core-concepts/principles/isis-itself}/_attributes.adoc  |   0
 .../principles/isis-itself/focuses-on-its-usp.adoc          |   0
 .../principles/isis-itself/full-stack-but-extensible.adoc   |   0
 .../fun/pages/core-concepts/principles/lego-blocks.adoc     |   0
 .../fun/pages/core-concepts/principles/testable.adoc        |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/crud.adoc        |   0
 .../_adoc-ug/modules/fun/pages/crud}/_attributes.adoc       |   0
 .../_adoc-ug}/modules/fun/pages/crud/deleting.adoc          |   0
 .../_adoc-ug}/modules/fun/pages/crud/finding.adoc           |   0
 .../_adoc-ug}/modules/fun/pages/crud/instantiating.adoc     |   0
 .../_adoc-ug}/modules/fun/pages/crud/persisting.adoc        |   0
 .../_adoc-ug}/modules/fun/pages/crud/updating.adoc          |   0
 .../modules/fun/pages/drop-downs-and-defaults.adoc          |   0
 .../_adoc-ug}/modules/fun/pages/programming-model.adoc      |   0
 .../modules/fun/pages/programming-model}/_attributes.adoc   |   0
 .../modules/fun/pages/programming-model/actions.adoc        |   0
 .../modules/fun/pages/programming-model/collections.adoc    |   0
 .../fun/pages/programming-model/domain-entities.adoc        |   0
 .../fun/pages/programming-model/domain-services.adoc        |   0
 .../programming-model/domain-services}/_attributes.adoc     |   0
 .../domain-services/event-subscribers.adoc                  |   0
 .../programming-model/domain-services/initialization.adoc   |   0
 .../fun/pages/programming-model/domain-services/menu.adoc   |   0
 .../domain-services/organizing-services.adoc                |   0
 .../programming-model/domain-services/registering.adoc      |   0
 .../domain-services/repository-and-factory.adoc             |   0
 .../programming-model/domain-services/scoped-services.adoc  |   0
 .../fun/pages/programming-model/inject-services.adoc        |   0
 .../modules/fun/pages/programming-model/mixins.adoc         |   0
 .../fun/pages/programming-model/mixins}/_attributes.adoc    |   0
 .../pages/programming-model/mixins/contributed-action.adoc  |   0
 .../programming-model/mixins/contributed-collection.adoc    |   0
 .../programming-model/mixins/contributed-property.adoc      |   0
 .../fun/pages/programming-model/mixins/inferred-name.adoc   |   0
 .../programming-model/mixins/nested-static-classes.adoc     |   0
 .../pages/programming-model/mixins/programmatic-usage.adoc  |   0
 .../pages/programming-model/properties-vs-parameters.adoc   |   0
 .../modules/fun/pages/programming-model/properties.adoc     |   0
 .../modules/fun/pages/programming-model/view-models.adoc    |   0
 .../pages/programming-model/view-models}/_attributes.adoc   |   0
 .../fun/pages/programming-model/view-models/dto.adoc        |   0
 .../programming-model/view-models/dto/_attributes.adoc      |   0
 .../programming-model/view-models/dto/dto-consumers.adoc    |   0
 .../programming-model/view-models/dto/generating-xsds.adoc  |   0
 .../pages/programming-model/view-models/dto/versioning.adoc |   0
 .../fun/pages/programming-model/view-models/jaxb.adoc       |   0
 .../programming-model/view-models/jaxb}/_attributes.adoc    |   0
 .../programming-model/view-models/jaxb/joda-datatypes.adoc  |   0
 .../view-models/jaxb/referencing-domain-entities.adoc       |   0
 .../fun/pages/programming-model/view-models/non-jaxb.adoc   |   0
 .../ug => core/_adoc-ug}/modules/fun/pages/ui-hints.adoc    |   0
 .../_adoc-ug/modules/fun/pages/ui-hints}/_attributes.adoc   |   0
 .../modules/fun/pages/ui-hints/action-icons-and-css.adoc    |   0
 .../modules/fun/pages/ui-hints/eager-rendering.adoc         |   0
 .../_adoc-ug}/modules/fun/pages/ui-hints/layout.adoc        |   0
 .../modules/fun/pages/ui-hints/names-and-descriptions.adoc  |   0
 .../modules/fun/pages/ui-hints/object-titles-and-icons.adoc |   0
 {antora/components/ug => core/_adoc-ug}/sync_examples.sh    |   0
 site.yml                                                    |   2 +-
 187 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora/components/ug/antora.yml b/core/_adoc-ug/antora.yml
similarity index 81%
rename from antora/components/ug/antora.yml
rename to core/_adoc-ug/antora.yml
index 50f35cf..efb09af 100644
--- a/antora/components/ug/antora.yml
+++ b/core/_adoc-ug/antora.yml
@@ -1,5 +1,5 @@
 name: ug
-title: "Guides - User Guides"
+title: "User Guide"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/ug/examples.csv b/core/_adoc-ug/examples.csv
similarity index 100%
rename from antora/components/ug/examples.csv
rename to core/_adoc-ug/examples.csv
diff --git a/antora/components/ug/modules/fun/_attributes.adoc b/core/_adoc-ug/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug/modules/ROOT/nav.adoc b/core/_adoc-ug/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/nav.adoc
rename to core/_adoc-ug/modules/ROOT/nav.adoc
diff --git a/antora/components/ug/modules/fun/pages/_attributes.adoc b/core/_adoc-ug/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/_attributes.adoc b/core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/_attributes.adoc
rename to core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/core/_adoc-ug/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/about.adoc
rename to core/_adoc-ug/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug/modules/btb/_attributes.adoc b/core/_adoc-ug/modules/btb/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/_attributes.adoc
rename to core/_adoc-ug/modules/btb/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/examples/.gitkeep b/core/_adoc-ug/modules/btb/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/fun/examples/.gitkeep
rename to core/_adoc-ug/modules/btb/assets/attachments/.gitkeep
diff --git a/antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png b/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
rename to core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
diff --git a/antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
diff --git a/antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-success.png b/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
rename to core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/key.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/key.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/parts.pptx b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/ro-only.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
diff --git a/antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png b/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from antora/components/ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
rename to core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
diff --git a/antora/components/ug/modules/btb/examples/.gitkeep b/core/_adoc-ug/modules/btb/examples/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/btb/examples/.gitkeep
rename to core/_adoc-ug/modules/btb/examples/.gitkeep
diff --git a/antora/components/ug/modules/btb/nav.adoc b/core/_adoc-ug/modules/btb/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/nav.adoc
rename to core/_adoc-ug/modules/btb/nav.adoc
diff --git a/antora/components/ug/modules/btb/pages/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/about.adoc b/core/_adoc-ug/modules/btb/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/about.adoc
rename to core/_adoc-ug/modules/btb/pages/about.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment.adoc b/core/_adoc-ug/modules/btb/pages/deployment.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/cmd-line.adoc b/core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/cmd-line.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/docker.adoc b/core/_adoc-ug/modules/btb/pages/deployment/docker.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/docker.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/docker.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc b/core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/externalized-configuration.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/gae.adoc b/core/_adoc-ug/modules/btb/pages/deployment/gae.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/gae.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/gae.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc b/core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/neo4j.adoc b/core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/neo4j.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/tomcat.adoc b/core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/tomcat.adoc
rename to core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access.adoc b/core/_adoc-ug/modules/btb/pages/headless-access.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/persisted-title.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
rename to core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
diff --git a/antora/components/ug/modules/btb/pages/i18n.adoc b/core/_adoc-ug/modules/btb/pages/i18n.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/i18n.adoc
rename to core/_adoc-ug/modules/btb/pages/i18n.adoc
diff --git a/antora/components/ug/modules/btb/pages/other-techniques.adoc b/core/_adoc-ug/modules/btb/pages/other-techniques.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/other-techniques.adoc
rename to core/_adoc-ug/modules/btb/pages/other-techniques.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model.adoc b/core/_adoc-ug/modules/btb/pages/programming-model.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/_attributes.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/_attributes.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/custom-validator.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/custom-validator.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/finetuning.adoc b/core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/finetuning.adoc
rename to core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/core/_adoc-ug/modules/btb/pages/web-xml.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/web-xml.adoc
rename to core/_adoc-ug/modules/btb/pages/web-xml.adoc
diff --git a/antora/components/ug/modules/ROOT/_attributes.adoc b/core/_adoc-ug/modules/fun/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/_attributes.adoc
rename to core/_adoc-ug/modules/fun/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from antora/components/ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx b/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/antora/components/ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png b/core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from antora/components/ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
rename to core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
diff --git a/antora/components/ug/modules/btb/assets/attachments/.gitkeep b/core/_adoc-ug/modules/fun/examples/.gitkeep
similarity index 100%
rename from antora/components/ug/modules/btb/assets/attachments/.gitkeep
rename to core/_adoc-ug/modules/fun/examples/.gitkeep
diff --git a/antora/components/ug/modules/fun/nav.adoc b/core/_adoc-ug/modules/fun/nav.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/nav.adoc
rename to core/_adoc-ug/modules/fun/nav.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/about.adoc b/core/_adoc-ug/modules/fun/pages/about.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/about.adoc
rename to core/_adoc-ug/modules/fun/pages/about.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/framework-provided.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/framework-provided.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc
diff --git a/antora/components/ug/modules/fun/pages/available-domain-services/incode-platform.adoc b/core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/available-domain-services/incode-platform.adoc
rename to core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks.adoc
diff --git a/antora/components/ug/modules/btb/pages/programming-model/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/programming-model/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/domain-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/domain-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/ui-events.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/ui-events.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/modules.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/modules.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/object-members.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/object-members.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
rename to core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules.adoc b/core/_adoc-ug/modules/fun/pages/business-rules.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules.adoc
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/hints-and-tips/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/actions.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/actions.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/side-effects.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/side-effects.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/usability.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/usability.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/validity.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/validity.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc
diff --git a/antora/components/ug/modules/fun/pages/business-rules/visibility.adoc b/core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/business-rules/visibility.adoc
rename to core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts.adoc
diff --git a/antora/components/ug/modules/btb/pages/headless-access/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/headless-access/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/deployment-options.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/aop.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/dci.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/testable.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/testable.adoc
rename to core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud.adoc b/core/_adoc-ug/modules/fun/pages/crud.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud.adoc
rename to core/_adoc-ug/modules/fun/pages/crud.adoc
diff --git a/antora/components/ug/modules/btb/pages/deployment/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/deployment/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/deleting.adoc b/core/_adoc-ug/modules/fun/pages/crud/deleting.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/deleting.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/deleting.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/finding.adoc b/core/_adoc-ug/modules/fun/pages/crud/finding.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/finding.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/finding.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/instantiating.adoc b/core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/instantiating.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/persisting.adoc b/core/_adoc-ug/modules/fun/pages/crud/persisting.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/persisting.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/persisting.adoc
diff --git a/antora/components/ug/modules/fun/pages/crud/updating.adoc b/core/_adoc-ug/modules/fun/pages/crud/updating.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/crud/updating.adoc
rename to core/_adoc-ug/modules/fun/pages/crud/updating.adoc
diff --git a/antora/components/ug/modules/fun/pages/drop-downs-and-defaults.adoc b/core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/drop-downs-and-defaults.adoc
rename to core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model.adoc b/core/_adoc-ug/modules/fun/pages/programming-model.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model.adoc
diff --git a/antora/components/ug/modules/btb/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/btb/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/actions.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/actions.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/collections.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/initialization.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/registering.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/registering.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/inject-services.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/inject-services.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/properties.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/events/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/building-blocks/events/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
diff --git a/antora/components/ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc b/core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
rename to core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints.adoc
diff --git a/antora/components/ug/modules/ROOT/pages/_partials/_attributes.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc
similarity index 100%
rename from antora/components/ug/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/eager-rendering.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/eager-rendering.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
similarity index 100%
rename from antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
rename to core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
diff --git a/antora/components/ug/sync_examples.sh b/core/_adoc-ug/sync_examples.sh
similarity index 100%
rename from antora/components/ug/sync_examples.sh
rename to core/_adoc-ug/sync_examples.sh
diff --git a/site.yml b/site.yml
index c713813..71a6bc5 100644
--- a/site.yml
+++ b/site.yml
@@ -6,7 +6,7 @@ site:
 content:
   sources:
   - url: .
-    start_path: antora/components/ug
+    start_path: core/_adoc-ug
     branches: HEAD
   - url: .
     start_path: core/plugins/jdo/_adoc