[isis] 09/09: ISIS-2062: renames fis to runtime-services

[da...@apache.org]

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 16d0081fee85d68ba764a3e66f2fa22d656fb323
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Oct 4 07:56:55 2019 +0100

    ISIS-2062: renames fis to runtime-services
---
 antora/components/toc/modules/ROOT/nav.adoc        |   2 +-
 .../components/toc/modules/ROOT/pages/about.adoc   |   2 +-
 .../toc/modules/ROOT/pages/internal.adoc           |   2 +-
 .../components/userguide}/antora.yml               |   0
 .../components/userguide}/examples.csv             |   0
 .../userguide/modules/ROOT}/_attributes.adoc       |   0
 .../components/userguide}/modules/ROOT/nav.adoc    |   0
 .../userguide/modules/ROOT}/pages/_attributes.adoc |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../userguide}/modules/ROOT/pages/about.adoc       |   0
 .../userguide}/modules/btb/_attributes.adoc        |   0
 .../modules/btb/assets/attachments}/.gitkeep       |   0
 .../headless-access/BackgroundCommandExecution.png | Bin
 ...andExecutionFromBackgroundCommandServiceJdo.png | Bin
 .../action-semantics-are-you-sure.png              | Bin
 .../hints-and-tips/are-you-sure-happy-case.png     | Bin
 .../hints-and-tips/are-you-sure-sad-case.png       | Bin
 .../assets/images/hints-and-tips/are-you-sure.png  | Bin
 .../images/hints-and-tips/view-model-fail.png      | Bin
 .../images/hints-and-tips/view-model-success.png   | Bin
 .../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
 .../images/runtime/web-xml/wicket-and-ro.png       | Bin
 .../assets/images/runtime/web-xml/wicket-only.png  | Bin
 .../userguide}/modules/btb/examples/.gitkeep       |   0
 .../components/userguide}/modules/btb/nav.adoc     |   0
 .../userguide}/modules/btb/pages/_attributes.adoc  |   0
 .../modules/btb/pages/_partials}/_attributes.adoc  |   0
 .../userguide}/modules/btb/pages/about.adoc        |   0
 .../userguide}/modules/btb/pages/deployment.adoc   |   0
 .../modules/btb/pages/deployment}/_attributes.adoc |   0
 .../modules/btb/pages/deployment/cmd-line.adoc     |   0
 .../modules/btb/pages/deployment/docker.adoc       |   0
 .../deployment/externalized-configuration.adoc     |   0
 .../modules/btb/pages/deployment/gae.adoc          |   0
 .../modules/btb/pages/deployment/jvm-flags.adoc    |   0
 .../modules/btb/pages/deployment/neo4j.adoc        |   0
 .../modules/btb/pages/deployment/tomcat.adoc       |   0
 .../modules/btb/pages/headless-access.adoc         |   0
 .../AbstractIsisSessionTemplate.adoc               |   0
 .../BackgroundCommandExecution.adoc                |   0
 .../btb/pages/headless-access}/_attributes.adoc    |   0
 .../modules/btb/pages/hints-and-tips.adoc          |   0
 .../btb/pages/hints-and-tips}/_attributes.adoc     |   0
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |   0
 .../how-to-handle-void-and-null-results.adoc       |   0
 .../how-to-implement-a-spellchecker.adoc           |   0
 .../btb/pages/hints-and-tips/multi-tenancy.adoc    |   0
 .../btb/pages/hints-and-tips/persisted-title.adoc  |   0
 .../btb/pages/hints-and-tips/pushing-changes.adoc  |   0
 .../replacing-default-service-implementations.adoc |   0
 .../simulating-collections-of-values.adoc          |   0
 .../subclass-properties-in-tables.adoc             |   0
 .../hints-and-tips/transactions-and-errors.adoc    |   0
 .../pages/hints-and-tips/vetoing-visibility.adoc   |   0
 .../hints-and-tips/view-model-instantiation.adoc   |   0
 .../userguide}/modules/btb/pages/i18n.adoc         |   0
 .../modules/btb/pages/other-techniques.adoc        |   0
 .../modules/btb/pages/programming-model.adoc       |   0
 .../btb/pages/programming-model}/_attributes.adoc  |   0
 .../pages/programming-model/custom-validator.adoc  |   0
 .../btb/pages/programming-model/finetuning.adoc    |   0
 .../userguide}/modules/btb/pages/web-xml.adoc      |   0
 .../userguide}/modules/fun/.asciidoctorconfig      |   0
 .../userguide/modules/fun}/_attributes.adoc        |   0
 .../core-concepts/Pawson-Naked-Objects-thesis.pdf  | Bin
 .../core-concepts/philosophy/build-vs-buy.png      | Bin
 .../core-concepts/philosophy/build-vs-buy.pptx     | Bin
 .../philosophy/decoupled-applications.png          | Bin
 .../philosophy/decoupled-applications.pptx         | Bin
 .../philosophy/hexagonal-architecture-addons.png   | Bin
 .../philosophy/hexagonal-architecture.png          | Bin
 .../philosophy/hexagonal-architecture.pptx         | Bin
 .../images/programming-model/todoapp-Dashboard.png | Bin
 .../userguide/modules/fun/examples}/.gitkeep       |   0
 .../components/userguide}/modules/fun/nav.adoc     |   0
 .../userguide/modules/fun}/pages/_attributes.adoc  |   0
 .../modules/fun/pages/_partials}/_attributes.adoc  |   0
 .../userguide}/modules/fun/pages/about.adoc        |   0
 .../fun/pages/available-domain-services.adoc       |   0
 .../available-domain-services}/_attributes.adoc    |   0
 .../framework-provided.adoc                        |   0
 .../available-domain-services/incode-platform.adoc |   0
 .../modules/fun/pages/building-blocks.adoc         |   0
 .../fun/pages/building-blocks}/_attributes.adoc    |   0
 .../modules/fun/pages/building-blocks/events.adoc  |   0
 .../pages/building-blocks/events}/_attributes.adoc |   0
 .../building-blocks/events/domain-events.adoc      |   0
 .../building-blocks/events/lifecycle-events.adoc   |   0
 .../pages/building-blocks/events/ui-events.adoc    |   0
 .../fun/pages/building-blocks/identifiers.adoc     |   0
 .../building-blocks/identifiers}/_attributes.adoc  |   0
 .../fun/pages/building-blocks/identifiers/oid.adoc |   0
 .../identifiers/title-and-icon-and-css-class.adoc  |   0
 .../fun/pages/building-blocks/metamodel.adoc       |   0
 .../modules/fun/pages/building-blocks/modules.adoc |   0
 .../fun/pages/building-blocks/object-members.adoc  |   0
 .../building-blocks/types-of-domain-objects.adoc   |   0
 .../types-of-domain-objects}/_attributes.adoc      |   0
 .../types-of-domain-objects/domain-entities.adoc   |   0
 .../types-of-domain-objects/domain-services.adoc   |   0
 .../types-of-domain-objects/mixins.adoc            |   0
 .../types-of-domain-objects/view-models.adoc       |   0
 .../modules/fun/pages/business-rules.adoc          |   0
 .../fun/pages/business-rules}/_attributes.adoc     |   0
 .../modules/fun/pages/business-rules/actions.adoc  |   0
 .../fun/pages/business-rules/side-effects.adoc     |   0
 .../fun/pages/business-rules/usability.adoc        |   0
 .../modules/fun/pages/business-rules/validity.adoc |   0
 .../fun/pages/business-rules/visibility.adoc       |   0
 .../modules/fun/pages/core-concepts.adoc           |   0
 .../fun/pages/core-concepts}/_attributes.adoc      |   0
 .../fun/pages/core-concepts/apache-isis-vs.adoc    |   0
 .../core-concepts/apache-isis-vs}/_attributes.adoc |   0
 .../pages/core-concepts/apache-isis-vs/cqrs.adoc   |   0
 .../apache-isis-vs/event-sourcing.adoc             |   0
 .../apache-isis-vs/mvc-server-side.adoc            |   0
 .../pages/core-concepts/deployment-options.adoc    |   0
 .../fun/pages/core-concepts/philosophy.adoc        |   0
 .../core-concepts/philosophy/_attributes.adoc      |   0
 .../fun/pages/core-concepts/philosophy/aop.adoc    |   0
 .../fun/pages/core-concepts/philosophy/dci.adoc    |   0
 .../philosophy/domain-driven-design.adoc           |   0
 .../philosophy/hexagonal-architecture.adoc         |   0
 .../core-concepts/philosophy/how-eases-ddd.adoc    |   0
 .../philosophy/naked-objects-pattern.adoc          |   0
 .../fun/pages/core-concepts/principles.adoc        |   0
 .../core-concepts/principles}/_attributes.adoc     |   0
 .../core-concepts/principles/build-not-buy.adoc    |   0
 .../principles/for-the-long-term.adoc              |   0
 .../core-concepts/principles/isis-itself.adoc      |   0
 .../principles/isis-itself}/_attributes.adoc       |   0
 .../principles/isis-itself/focuses-on-its-usp.adoc |   0
 .../isis-itself/full-stack-but-extensible.adoc     |   0
 .../core-concepts/principles/lego-blocks.adoc      |   0
 .../pages/core-concepts/principles/testable.adoc   |   0
 .../userguide}/modules/fun/pages/crud.adoc         |   0
 .../modules/fun/pages/crud}/_attributes.adoc       |   0
 .../modules/fun/pages/crud/deleting.adoc           |   0
 .../userguide}/modules/fun/pages/crud/finding.adoc |   0
 .../modules/fun/pages/crud/instantiating.adoc      |   0
 .../modules/fun/pages/crud/persisting.adoc         |   0
 .../modules/fun/pages/crud/updating.adoc           |   0
 .../modules/fun/pages/drop-downs-and-defaults.adoc |   0
 .../modules/fun/pages/programming-model.adoc       |   0
 .../fun/pages/programming-model}/_attributes.adoc  |   0
 .../fun/pages/programming-model/actions.adoc       |   0
 .../fun/pages/programming-model/collections.adoc   |   0
 .../pages/programming-model/domain-entities.adoc   |   0
 .../pages/programming-model/domain-services.adoc   |   0
 .../domain-services}/_attributes.adoc              |   0
 .../domain-services/event-subscribers.adoc         |   0
 .../domain-services/initialization.adoc            |   0
 .../programming-model/domain-services/menu.adoc    |   0
 .../domain-services/organizing-services.adoc       |   0
 .../domain-services/registering.adoc               |   0
 .../domain-services/repository-and-factory.adoc    |   0
 .../domain-services/scoped-services.adoc           |   0
 .../pages/programming-model/inject-services.adoc   |   0
 .../fun/pages/programming-model/mixins.adoc        |   0
 .../programming-model/mixins}/_attributes.adoc     |   0
 .../mixins/contributed-action.adoc                 |   0
 .../mixins/contributed-collection.adoc             |   0
 .../mixins/contributed-property.adoc               |   0
 .../programming-model/mixins/inferred-name.adoc    |   0
 .../mixins/nested-static-classes.adoc              |   0
 .../mixins/programmatic-usage.adoc                 |   0
 .../properties-vs-parameters.adoc                  |   0
 .../fun/pages/programming-model/properties.adoc    |   0
 .../fun/pages/programming-model/view-models.adoc   |   0
 .../view-models}/_attributes.adoc                  |   0
 .../pages/programming-model/view-models/dto.adoc   |   0
 .../view-models/dto/_attributes.adoc               |   0
 .../view-models/dto/dto-consumers.adoc             |   0
 .../view-models/dto/generating-xsds.adoc           |   0
 .../view-models/dto/versioning.adoc                |   0
 .../pages/programming-model/view-models/jaxb.adoc  |   0
 .../view-models/jaxb}/_attributes.adoc             |   0
 .../view-models/jaxb/joda-datatypes.adoc           |   0
 .../jaxb/referencing-domain-entities.adoc          |   0
 .../programming-model/view-models/non-jaxb.adoc    |   0
 .../userguide}/modules/fun/pages/ui-hints.adoc     |   0
 .../modules/fun/pages/ui-hints}/_attributes.adoc   |   0
 .../fun/pages/ui-hints/action-icons-and-css.adoc   |   0
 .../fun/pages/ui-hints/eager-rendering.adoc        |   0
 .../modules/fun/pages/ui-hints/layout.adoc         |   0
 .../fun/pages/ui-hints/names-and-descriptions.adoc |   0
 .../pages/ui-hints/object-titles-and-icons.adoc    |   0
 .../components/userguide}/sync_examples.sh         |   0
 core/_adoc-fis/modules/ROOT/nav.adoc               |  25 ---------------------
 .../application-layer-api/BackgroundService.adoc   |   4 ++--
 core/applib/_adoc/modules/svc/pages/intro.adoc     |  10 ++++-----
 .../persistence-layer-api/MetricsService.adoc      |   2 +-
 .../persistence-layer-spi/PublisherService.adoc    |   4 ++--
 .../AcceptHeaderService.adoc                       |   2 +-
 .../ContentMappingService.adoc                     |   6 ++---
 .../modules/svc/pages/testing/SudoService.adoc     |   4 ++--
 .../_adoc}/antora.yml                              |   4 ++--
 .../_adoc}/examples.csv                            |   0
 .../_adoc}/modules/ROOT/_attributes.adoc           |   0
 .../modules/ROOT/assets/attachments}/.gitkeep      |   0
 .../ContentNegotiationService/accept-json.png      | Bin
 .../ContentNegotiationService/accept-xml.png       | Bin
 .../ContentNegotiationService/facade-choices.png   | Bin
 .../ContentNegotiationService/facade-choices.pptx  | Bin
 .../service-collaborations.png                     | Bin
 .../service-collaborations.pptx                    | Bin
 .../_adoc/modules/ROOT/examples}/.gitkeep          |   0
 core/runtime-services/_adoc/modules/ROOT/nav.adoc  |  20 +++++++++++++++++
 .../_adoc}/modules/ROOT/pages/_attributes.adoc     |   0
 .../modules/ROOT/pages/_partials}/_attributes.adoc |   0
 .../_adoc}/modules/ROOT/pages/about.adoc           |   0
 .../modules/ROOT/pages/application-layer.adoc      |   6 ++---
 .../AuthenticationSessionProvider.adoc             |   0
 .../CommandDtoServiceInternal.adoc                 |   2 +-
 .../InteractionDtoServiceInternal.adoc             |   2 +-
 .../ROOT/pages/application-layer}/_attributes.adoc |   0
 .../modules/ROOT/pages/persistence-layer.adoc      |  14 ++++++------
 .../persistence-layer/AuditingServiceInternal.adoc |   6 ++---
 .../ChangedObjectsServiceInternal.adoc             |   8 +++----
 .../PersistenceSessionServiceInternal.adoc         |   0
 .../PublishingServiceInternal.adoc                 |   6 ++---
 .../ROOT/pages/persistence-layer}/_attributes.adoc |   0
 .../modules/ROOT/pages/presentation-layer.adoc     |   6 ++---
 .../ContentNegotiationService.adoc                 |   2 +-
 .../presentation-layer/RepresentationService.adoc  |   8 +++----
 .../pages/presentation-layer}/_attributes.adoc     |   0
 .../_adoc}/sync_examples.sh                        |   0
 .../_adoc/modules/ROOT/pages/architecture.adoc     |   4 ++--
 site.yml                                           |   6 ++++-
 231 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index cd6513b..d1311cd 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -97,7 +97,7 @@ _for bug reports & feature requests_
 [external]
 **  xref:archdesign:ROOT:about.adoc[Architecture & Design]
 [external]
-**  xref:fis:ROOT:about.adoc[Framework Internal Services]
+**  xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
 [external]
 **  xref:smoketests:ROOT:about.adoc[SmokeTest App]
 
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 712bf80..97c7f98 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -116,7 +116,7 @@ _for bug reports & feature requests_
 |*xref:toc:ROOT:internal.adoc#implementation[Implementation]*
 
 *  xref:archdesign:ROOT:about.adoc[Architecture & Design]
-*  xref:fis:ROOT:about.adoc[Framework Internal Services]
+*  xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
 *  xref:smoketests:ROOT:about.adoc[SmokeTest App]
 
 
diff --git a/antora/components/toc/modules/ROOT/pages/internal.adoc b/antora/components/toc/modules/ROOT/pages/internal.adoc
index 9093fca..f3592e7 100644
--- a/antora/components/toc/modules/ROOT/pages/internal.adoc
+++ b/antora/components/toc/modules/ROOT/pages/internal.adoc
@@ -16,6 +16,6 @@ They include guides for day-to-day operations, as well as notes on the design/im
 == Implementation
 
 *  xref:archdesign:ROOT:about.adoc[Architecture & Design]
-*  xref:fis:ROOT:about.adoc[Framework Internal Services]
+*  xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
 *  xref:smoketests:ROOT:about.adoc[SmokeTest App]
 
diff --git a/core/_adoc-ug/antora.yml b/antora/components/userguide/antora.yml
similarity index 100%
rename from core/_adoc-ug/antora.yml
rename to antora/components/userguide/antora.yml
diff --git a/core/_adoc-ug/examples.csv b/antora/components/userguide/examples.csv
similarity index 100%
rename from core/_adoc-ug/examples.csv
rename to antora/components/userguide/examples.csv
diff --git a/core/_adoc-ug/modules/fun/_attributes.adoc b/antora/components/userguide/modules/ROOT/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/_attributes.adoc
rename to antora/components/userguide/modules/ROOT/_attributes.adoc
diff --git a/core/_adoc-ug/modules/ROOT/nav.adoc b/antora/components/userguide/modules/ROOT/nav.adoc
similarity index 100%
rename from core/_adoc-ug/modules/ROOT/nav.adoc
rename to antora/components/userguide/modules/ROOT/nav.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/_attributes.adoc b/antora/components/userguide/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/_attributes.adoc
rename to antora/components/userguide/modules/ROOT/pages/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc b/antora/components/userguide/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/_attributes.adoc
rename to antora/components/userguide/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/core/_adoc-ug/modules/ROOT/pages/about.adoc b/antora/components/userguide/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/_adoc-ug/modules/ROOT/pages/about.adoc
rename to antora/components/userguide/modules/ROOT/pages/about.adoc
diff --git a/core/_adoc-ug/modules/btb/_attributes.adoc b/antora/components/userguide/modules/btb/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/_attributes.adoc
rename to antora/components/userguide/modules/btb/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/examples/.gitkeep b/antora/components/userguide/modules/btb/assets/attachments/.gitkeep
similarity index 100%
rename from core/_adoc-ug/modules/fun/examples/.gitkeep
rename to antora/components/userguide/modules/btb/assets/attachments/.gitkeep
diff --git a/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png b/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
rename to antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/are-you-sure.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/are-you-sure.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-fail.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-fail.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png b/antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/hints-and-tips/view-model-success.png
rename to antora/components/userguide/modules/btb/assets/images/hints-and-tips/view-model-success.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png b/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/key.png
rename to antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx b/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/parts.pptx
rename to antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx
diff --git a/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png b/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/ro-only.png
rename to antora/components/userguide/modules/btb/assets/images/runtime/web-xml/ro-only.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png b/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
rename to antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-and-ro.png
diff --git a/core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png b/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/images/runtime/web-xml/wicket-only.png
rename to antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-only.png
diff --git a/core/_adoc-ug/modules/btb/examples/.gitkeep b/antora/components/userguide/modules/btb/examples/.gitkeep
similarity index 100%
rename from core/_adoc-ug/modules/btb/examples/.gitkeep
rename to antora/components/userguide/modules/btb/examples/.gitkeep
diff --git a/core/_adoc-ug/modules/btb/nav.adoc b/antora/components/userguide/modules/btb/nav.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/nav.adoc
rename to antora/components/userguide/modules/btb/nav.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/_attributes.adoc b/antora/components/userguide/modules/btb/pages/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc b/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/about.adoc b/antora/components/userguide/modules/btb/pages/about.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/about.adoc
rename to antora/components/userguide/modules/btb/pages/about.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment.adoc b/antora/components/userguide/modules/btb/pages/deployment.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment.adoc
rename to antora/components/userguide/modules/btb/pages/deployment.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc b/antora/components/userguide/modules/btb/pages/deployment/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/_attributes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc b/antora/components/userguide/modules/btb/pages/deployment/cmd-line.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/cmd-line.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/cmd-line.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/docker.adoc b/antora/components/userguide/modules/btb/pages/deployment/docker.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/docker.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/docker.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc b/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/externalized-configuration.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/gae.adoc b/antora/components/userguide/modules/btb/pages/deployment/gae.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/gae.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/gae.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc b/antora/components/userguide/modules/btb/pages/deployment/jvm-flags.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/jvm-flags.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/jvm-flags.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc b/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/neo4j.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc b/antora/components/userguide/modules/btb/pages/deployment/tomcat.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/tomcat.adoc
rename to antora/components/userguide/modules/btb/pages/deployment/tomcat.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/headless-access.adoc b/antora/components/userguide/modules/btb/pages/headless-access.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/headless-access.adoc
rename to antora/components/userguide/modules/btb/pages/headless-access.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc b/antora/components/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
rename to antora/components/userguide/modules/btb/pages/headless-access/AbstractIsisSessionTemplate.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc b/antora/components/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
rename to antora/components/userguide/modules/btb/pages/headless-access/BackgroundCommandExecution.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc b/antora/components/userguide/modules/btb/pages/headless-access/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/headless-access/_attributes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/_attributes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/pushing-changes.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/pushing-changes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/i18n.adoc b/antora/components/userguide/modules/btb/pages/i18n.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/i18n.adoc
rename to antora/components/userguide/modules/btb/pages/i18n.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/other-techniques.adoc b/antora/components/userguide/modules/btb/pages/other-techniques.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/other-techniques.adoc
rename to antora/components/userguide/modules/btb/pages/other-techniques.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/programming-model.adoc b/antora/components/userguide/modules/btb/pages/programming-model.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/programming-model.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc b/antora/components/userguide/modules/btb/pages/programming-model/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/_attributes.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model/_attributes.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc b/antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/programming-model/custom-validator.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc b/antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/programming-model/finetuning.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/web-xml.adoc b/antora/components/userguide/modules/btb/pages/web-xml.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/web-xml.adoc
rename to antora/components/userguide/modules/btb/pages/web-xml.adoc
diff --git a/core/_adoc-ug/modules/fun/.asciidoctorconfig b/antora/components/userguide/modules/fun/.asciidoctorconfig
similarity index 100%
rename from core/_adoc-ug/modules/fun/.asciidoctorconfig
rename to antora/components/userguide/modules/fun/.asciidoctorconfig
diff --git a/core/_adoc-ug/modules/ROOT/_attributes.adoc b/antora/components/userguide/modules/fun/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/ROOT/_attributes.adoc
rename to antora/components/userguide/modules/fun/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/antora/components/userguide/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to antora/components/userguide/modules/fun/assets/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx b/antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png b/antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from core/_adoc-ug/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
rename to antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
diff --git a/core/_adoc-ug/modules/btb/assets/attachments/.gitkeep b/antora/components/userguide/modules/fun/examples/.gitkeep
similarity index 100%
rename from core/_adoc-ug/modules/btb/assets/attachments/.gitkeep
rename to antora/components/userguide/modules/fun/examples/.gitkeep
diff --git a/core/_adoc-ug/modules/fun/nav.adoc b/antora/components/userguide/modules/fun/nav.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/nav.adoc
rename to antora/components/userguide/modules/fun/nav.adoc
diff --git a/core/_adoc-ug/modules/ROOT/pages/_attributes.adoc b/antora/components/userguide/modules/fun/pages/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/ROOT/pages/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc b/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/available-domain-services/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/about.adoc b/antora/components/userguide/modules/fun/pages/about.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/about.adoc
rename to antora/components/userguide/modules/fun/pages/about.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/available-domain-services.adoc b/antora/components/userguide/modules/fun/pages/available-domain-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/available-domain-services.adoc
rename to antora/components/userguide/modules/fun/pages/available-domain-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/fun/pages/available-domain-services/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/_partials/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/available-domain-services/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc b/antora/components/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/available-domain-services/framework-provided.adoc
rename to antora/components/userguide/modules/fun/pages/available-domain-services/framework-provided.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc b/antora/components/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/available-domain-services/incode-platform.adoc
rename to antora/components/userguide/modules/fun/pages/available-domain-services/incode-platform.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks.adoc b/antora/components/userguide/modules/fun/pages/building-blocks.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/programming-model/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/events.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/events.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/events.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/events/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/events/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/events/domain-events.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/events/domain-events.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/events/lifecycle-events.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/events/ui-events.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/events/ui-events.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/identifiers.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/identifiers.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/identifiers.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/identifiers/oid.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/metamodel.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/metamodel.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/metamodel.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/modules.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/modules.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/modules.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/object-members.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/object-members.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/object-members.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-entities.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/mixins.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
rename to antora/components/userguide/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules.adoc b/antora/components/userguide/modules/fun/pages/business-rules.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc b/antora/components/userguide/modules/fun/pages/business-rules/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/hints-and-tips/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc b/antora/components/userguide/modules/fun/pages/business-rules/actions.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/actions.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/actions.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc b/antora/components/userguide/modules/fun/pages/business-rules/side-effects.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/side-effects.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/side-effects.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc b/antora/components/userguide/modules/fun/pages/business-rules/usability.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/usability.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/usability.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc b/antora/components/userguide/modules/fun/pages/business-rules/validity.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/validity.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/validity.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc b/antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/business-rules/visibility.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts.adoc b/antora/components/userguide/modules/fun/pages/core-concepts.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/headless-access/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/event-sourcing.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/deployment-options.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/deployment-options.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/deployment-options.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/aop.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/dci.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/dci.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/domain-driven-design.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/hexagonal-architecture.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/philosophy/naked-objects-pattern.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/build-not-buy.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/focuses-on-its-usp.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/isis-itself/full-stack-but-extensible.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/lego-blocks.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/principles/testable.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/testable.adoc
rename to antora/components/userguide/modules/fun/pages/core-concepts/principles/testable.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud.adoc b/antora/components/userguide/modules/fun/pages/crud.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud.adoc
rename to antora/components/userguide/modules/fun/pages/crud.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc b/antora/components/userguide/modules/fun/pages/crud/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/deployment/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/crud/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/deleting.adoc b/antora/components/userguide/modules/fun/pages/crud/deleting.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/deleting.adoc
rename to antora/components/userguide/modules/fun/pages/crud/deleting.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/finding.adoc b/antora/components/userguide/modules/fun/pages/crud/finding.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/finding.adoc
rename to antora/components/userguide/modules/fun/pages/crud/finding.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc b/antora/components/userguide/modules/fun/pages/crud/instantiating.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/instantiating.adoc
rename to antora/components/userguide/modules/fun/pages/crud/instantiating.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/persisting.adoc b/antora/components/userguide/modules/fun/pages/crud/persisting.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/persisting.adoc
rename to antora/components/userguide/modules/fun/pages/crud/persisting.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/crud/updating.adoc b/antora/components/userguide/modules/fun/pages/crud/updating.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/crud/updating.adoc
rename to antora/components/userguide/modules/fun/pages/crud/updating.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc b/antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/drop-downs-and-defaults.adoc
rename to antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model.adoc b/antora/components/userguide/modules/fun/pages/programming-model.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model.adoc
diff --git a/core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/btb/pages/_partials/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc b/antora/components/userguide/modules/fun/pages/programming-model/actions.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/actions.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/actions.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc b/antora/components/userguide/modules/fun/pages/programming-model/collections.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/collections.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/collections.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-entities.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-entities.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-entities.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/types-of-domain-objects/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/initialization.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/menu.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/menu.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/registering.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/repository-and-factory.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/inject-services.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/identifiers/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-action.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-action.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-collection.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/contributed-property.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/contributed-property.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/inferred-name.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/inferred-name.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/nested-static-classes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/mixins/programmatic-usage.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc b/antora/components/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/properties-vs-parameters.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/properties-vs-parameters.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc b/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/properties.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/building-blocks/events/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/dto.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/dto-consumers.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/generating-xsds.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/dto/versioning.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/core-concepts/principles/isis-itself/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/joda-datatypes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/jaxb/referencing-domain-entities.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints.adoc b/antora/components/userguide/modules/fun/pages/ui-hints.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints.adoc
diff --git a/core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/_attributes.adoc
similarity index 100%
rename from core/_adoc-ug/modules/ROOT/pages/_partials/_attributes.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/_attributes.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/action-icons-and-css.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/eager-rendering.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/eager-rendering.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/layout.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/layout.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/layout.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/names-and-descriptions.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/names-and-descriptions.adoc
diff --git a/core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
similarity index 100%
rename from core/_adoc-ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
rename to antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
diff --git a/core/_adoc-ug/sync_examples.sh b/antora/components/userguide/sync_examples.sh
similarity index 100%
rename from core/_adoc-ug/sync_examples.sh
rename to antora/components/userguide/sync_examples.sh
diff --git a/core/_adoc-fis/modules/ROOT/nav.adoc b/core/_adoc-fis/modules/ROOT/nav.adoc
deleted file mode 100644
index 6623efb..0000000
--- a/core/_adoc-fis/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,25 +0,0 @@
-* xref:about.adoc[Framework Internal Services]
-
-
-** xref:presentation-layer.adoc[Presentation Layer]
-*** xref:presentation-layer/ContentNegotiationService.adoc[ContentNegotiationService]
-*** xref:presentation-layer/RepresentationService.adoc[RepresentationService]
-
-
-
-** xref:application-layer.adoc[Application Layer]
-*** xref:application-layer/AuthenticationSessionProvider.adoc[AuthenticationSessionProvider]
-*** xref:application-layer/CommandDtoServiceInternal.adoc[CommandDtoServiceInternal]
-*** xref:application-layer/InteractionDtoServiceInternal.adoc[InteractionDtoServiceInternal]
-
-
-
-** xref:persistence-layer.adoc[Persistence Layer]
-*** xref:persistence-layer/AuditingServiceInternal.adoc[AuditingServiceInternal]
-*** xref:persistence-layer/ChangedObjectsServiceInternal.adoc[ChangedObjectsServiceInternal]
-*** xref:persistence-layer/PersistenceSessionServiceInternal.adoc[PersistenceSessionServiceInternal]
-*** xref:persistence-layer/PublishingServiceInternal.adoc[PublishingServiceInternal]
-
-
-
-
diff --git a/core/applib/_adoc/modules/svc/pages/application-layer-api/BackgroundService.adoc b/core/applib/_adoc/modules/svc/pages/application-layer-api/BackgroundService.adoc
index 4bf453b..5e6ed7d 100644
--- a/core/applib/_adoc/modules/svc/pages/application-layer-api/BackgroundService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/application-layer-api/BackgroundService.adoc
@@ -11,7 +11,7 @@ The `BackgroundService2` is responsible for capturing a memento representing the
 
 The default `BackgroundServiceDefault` implementation works by using a proxy wrapper around the target so that it can capture the action to invoke and its arguments.
 
-This is done using xref:fis:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`].
+This is done using xref:runtime-services:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`].
 
 The persistence delegates the persistence of the memento to an appropriate implementation of the companion `BackgroundCommandService2`.
 One such implementation of `BackgroundCommandService` is provided by (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module.
@@ -115,7 +115,7 @@ The latter is analogous to the way in which the `BackgroundCommandService` persi
 The implementations of `CommandService` and `BackgroundCommandService` go together; typically both parent `Command`s and child background `Command`s will be persisted in the same way.
 The (non-ASF) link:https://platform.incode.org[Incode Platform^]'s command module provides implementations of both (see xref:applib:svc:application-layer-spi/CommandService.adoc[`CommandService`] and xref:applib:svc:application-layer-spi/BackgroundCommandService.adoc[`BackgroundCommandService`]).
 
-The xref:fis:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`] is used to obtain a memento of the command such that it can be persisted.
+The xref:runtime-services:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`] is used to obtain a memento of the command such that it can be persisted.
 (In earlier versions, xref:applib:svc:integration-api/MementoService.adoc[`MementoService`] was used for this purpose).
 
 
diff --git a/core/applib/_adoc/modules/svc/pages/intro.adoc b/core/applib/_adoc/modules/svc/pages/intro.adoc
index 8678e56..92592e8 100644
--- a/core/applib/_adoc/modules/svc/pages/intro.adoc
+++ b/core/applib/_adoc/modules/svc/pages/intro.adoc
@@ -35,7 +35,7 @@ Importantly, this also minimizes the coupling between your code and Apache Isis,
 The framework also defines a number of "internal" services.
 These are not part of the framework's formal API, in that they use classes that are outside of the applib.
 These internal framework services should be thought of as part of the internal design of the framework, and are liable to change from release to release.
-The internal framework services are documented in the xref:fis:ROOT:about.adoc[Framework Internal Services] guide.
+The internal framework services are documented in the xref:runtime-services:ROOT:about.adoc[Framework Internal Services] guide.
 
 
 
@@ -172,15 +172,15 @@ Whether this occurs depends on whether the action/property has been annotated (u
 +
 (Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).
 
-* As each execution progresses, and objects that are modified are "enlisted" into the (internal) xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service.
+* As each execution progresses, and objects that are modified are "enlisted" into the (internal) xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service.
 Metrics as to which objects are merely loaded into memory are also captured using the xref:applib:svc:persistence-layer-api/MetricsService.adoc[`MetricsService`] (not shown on the diagram).
 
 * At the end of each execution, details of that execution are published through the (internal)
-xref:fis:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service.  This is only done for actions/properties annotated appropriate (with xref:applib:ant:Action.adoc#publishing[`@Action#publishing()`] or xref:applib:ant:Property.adoc#publishing[`@Property#publishing()`]).
+xref:runtime-services:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service.  This is only done for actions/properties annotated appropriate (with xref:applib:ant:Action.adoc#publishing[`@Action#publishing()`] or xref:applib:ant:Property.adoc#publishing[`@Property#publishing()`]).
 +
 The internal service delegates in turn to any registered xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`]s (there may be more than one).
 
-* At the end of each transaction, details of all changed objects are published, again through the (internal) xref:fis:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] to any registered `PublisherService` implementations.
+* At the end of each transaction, details of all changed objects are published, again through the (internal) xref:runtime-services:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] to any registered `PublisherService` implementations.
 Only domain objects specified to be published with xref:applib:ant:DomainObject.adoc#publishing[`@DomainObject#publishing()`] are published. +
 +
 [NOTE]
@@ -188,7 +188,7 @@ Only domain objects specified to be published with xref:applib:ant:DomainObject.
 Note that it's possible for there to be more than one transaction per top-level interaction, by virtue of the xref:applib:svc:application-layer-api/TransactionService.adoc[`TransactionService`].
 ====
 
-* Also at the end of each transaction, details of all changed properties are passed to any registered xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s) by way of the (internal) xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] domain service.
+* Also at the end of each transaction, details of all changed properties are passed to any registered xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s) by way of the (internal) xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] domain service.
 
 Implementations of xref:applib:svc:application-layer-spi/CommandService.adoc[`CommandService`] can use the `Command#getMemento()` method to obtain a XML equivalent of that `Command`, reified using the xref:schema:ROOT:cmd.adoc[`cmd.xsd`] schema.
 This can be converted back into a `CommandDto` using the `CommandDtoUtils` utility class (part of the applib).
diff --git a/core/applib/_adoc/modules/svc/pages/persistence-layer-api/MetricsService.adoc b/core/applib/_adoc/modules/svc/pages/persistence-layer-api/MetricsService.adoc
index 7e393d3..d0a170e 100644
--- a/core/applib/_adoc/modules/svc/pages/persistence-layer-api/MetricsService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/persistence-layer-api/MetricsService.adoc
@@ -8,7 +8,7 @@ include::_attributes.adoc[]
 
 The `MetricsService` is a request-scoped domain service that hooks into the JDO/DataNucleus ObjectStore to provide a number of counters relating to numbers of object loaded, dirtied etc.
 
-The service is used by the xref:applib:svc:application-layer-api/InteractionContext.adoc[`InteractionContext`] domain service (to populate the DTO held by the `Interaction.Execution`) and also by the (internal) xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] domain service (to populate the `PublishedObjects` class.
+The service is used by the xref:applib:svc:application-layer-api/InteractionContext.adoc[`InteractionContext`] domain service (to populate the DTO held by the `Interaction.Execution`) and also by the (internal) xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] domain service (to populate the `PublishedObjects` class.
 
 
 == API & Implementation
diff --git a/core/applib/_adoc/modules/svc/pages/persistence-layer-spi/PublisherService.adoc b/core/applib/_adoc/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
index f0b8d35..a32954d 100644
--- a/core/applib/_adoc/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
@@ -122,9 +122,9 @@ To support these use cases several other services are involved:
 
 * the xref:applib:svc:application-layer-api/InteractionContext.adoc[`InteractionContext`] is used to obtain the `Interaction` from which the member executions are published.
 
-* the (internal) xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service is used to obtain the set of objects modified throughout the transaction
+* the (internal) xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service is used to obtain the set of objects modified throughout the transaction
 
-* the (internal) xref:fis:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service filters these down to those changed objects that are also published (as per xref:applib:ant:DomainObject.adoc#publishing[`@DomainObject#publishing()`]) and delegates to the `PublisherService`.
+* the (internal) xref:runtime-services:ROOT:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service filters these down to those changed objects that are also published (as per xref:applib:ant:DomainObject.adoc#publishing[`@DomainObject#publishing()`]) and delegates to the `PublisherService`.
 
 * the xref:applib:svc:persistence-layer-api/MetricsService.adoc[`MetricsService`] is used to obtain the objects that are loaded throughout the transaction; this info is used in order to instantiate the `PublishedObjects` object passed through to the `PublisherService`.
 
diff --git a/core/applib/_adoc/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/core/applib/_adoc/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
index 1bf2a6b..4686823 100644
--- a/core/applib/_adoc/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
@@ -10,7 +10,7 @@ Its intended use is to support multiple versions of a REST API, where the respon
 
 [NOTE]
 ====
-As an alternative to performing content negotiation within the domain classes, the xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] SPI domain services allow the framework to perform the content negotiation responsibility.
+As an alternative to performing content negotiation within the domain classes, the xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] SPI domain services allow the framework to perform the content negotiation responsibility.
 ====
 
 == API & Implementation
diff --git a/core/applib/_adoc/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc b/core/applib/_adoc/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
index 60dbbf4..5cbaedd 100644
--- a/core/applib/_adoc/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
@@ -6,9 +6,9 @@ include::_attributes.adoc[]
 
 
 
-The `ContentMappingService` supports the (default implementation of the) xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:vro:ROOT:about.adoc[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
+The `ContentMappingService` supports the (default implementation of the) xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:vro:ROOT:about.adoc[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
 
-See xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] for further discussion.
+See xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] for further discussion.
 
 
 [NOTE]
@@ -74,6 +74,6 @@ public static class Util {
 
 == Related Services
 
-This service is a companion to the default implementation of the xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`].
+This service is a companion to the default implementation of the xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`].
 
 The framework implementations of `ContentMappingService` use the xref:applib:svc:metadata-api/MetamodelService.adoc[`MetaModelService`] to lookup any custom implementations of `CommandDtoProcessor`.
\ No newline at end of file
diff --git a/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc b/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
index 9076b6a..a3c967b 100644
--- a/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
@@ -32,7 +32,7 @@ which will run the provided block of code (a `Runnable` or a `Callable`) in a wa
 `UserService#getUser()` will return the specified user (and roles, if specified).
 (If roles are not specified, then the roles of the current user are preserved).
 
-The current user/role reported by the internal xref:fis:ROOT:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`] will also return the specified user/roles.
+The current user/role reported by the internal xref:runtime-services:ROOT:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`] will also return the specified user/roles.
 
 [IMPORTANT]
 ====
@@ -69,7 +69,7 @@ protected void execute(final ExecutionContext ec) {
 
 === ACCESS_ALL_ROLE
 
-When `sudo(...)` is called the "effective user" is reported by both xref:applib:svc:core-domain-api/UserService.adoc[`UserService`] and by xref:fis:ROOT:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`], but does not propagate through to the xref:security:ROOT:about.adoc[Shiro security mechanism].
+When `sudo(...)` is called the "effective user" is reported by both xref:applib:svc:core-domain-api/UserService.adoc[`UserService`] and by xref:runtime-services:ROOT:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`], but does not propagate through to the xref:security:ROOT:about.adoc[Shiro security mechanism].
 These continue to be evaluated according to the permissions of the current user.
 
 This can be a problem in certain use cases.
diff --git a/core/_adoc-fis/antora.yml b/core/runtime-services/_adoc/antora.yml
similarity index 59%
rename from core/_adoc-fis/antora.yml
rename to core/runtime-services/_adoc/antora.yml
index 269c550..52637fd 100644
--- a/core/_adoc-fis/antora.yml
+++ b/core/runtime-services/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: fis
-title: "Framework Internal Services"
+name: runtime-services
+title: "Runtime Services"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/core/_adoc-fis/examples.csv b/core/runtime-services/_adoc/examples.csv
similarity index 100%
rename from core/_adoc-fis/examples.csv
rename to core/runtime-services/_adoc/examples.csv
diff --git a/core/_adoc-fis/modules/ROOT/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
diff --git a/core/_adoc-fis/modules/ROOT/examples/.gitkeep b/core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/examples/.gitkeep
rename to core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png b/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png b/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png b/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx b/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/RepresentationService/service-collaborations.png b/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/RepresentationService/service-collaborations.png
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png
diff --git a/core/_adoc-fis/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx b/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx
rename to core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx
diff --git a/core/_adoc-fis/modules/ROOT/assets/attachments/.gitkeep b/core/runtime-services/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/assets/attachments/.gitkeep
rename to core/runtime-services/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/core/runtime-services/_adoc/modules/ROOT/nav.adoc b/core/runtime-services/_adoc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..d09575f
--- /dev/null
+++ b/core/runtime-services/_adoc/modules/ROOT/nav.adoc
@@ -0,0 +1,20 @@
+* xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
+
+** xref:runtime-services:ROOT:presentation-layer.adoc[Presentation Layer]
+*** xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[ContentNegotiationService]
+*** xref:runtime-services:ROOT:presentation-layer/RepresentationService.adoc[RepresentationService]
+
+** xref:runtime-services:ROOT:application-layer.adoc[Application Layer]
+*** xref:runtime-services:ROOT:application-layer/AuthenticationSessionProvider.adoc[AuthenticationSessionProvider]
+*** xref:runtime-services:ROOT:application-layer/CommandDtoServiceInternal.adoc[CommandDtoServiceInternal]
+*** xref:runtime-services:ROOT:application-layer/InteractionDtoServiceInternal.adoc[InteractionDtoServiceInternal]
+
+** xref:runtime-services:ROOT:persistence-layer.adoc[Persistence Layer]
+*** xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[AuditingServiceInternal]
+*** xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[ChangedObjectsServiceInternal]
+*** xref:runtime-services:ROOT:persistence-layer/PersistenceSessionServiceInternal.adoc[PersistenceSessionServiceInternal]
+*** xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[PublishingServiceInternal]
+
+
+
+
diff --git a/core/_adoc-fis/modules/ROOT/pages/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/presentation-layer/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/presentation-layer/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/about.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/about.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/about.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/application-layer.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer.adoc
similarity index 90%
rename from core/_adoc-fis/modules/ROOT/pages/application-layer.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/application-layer.adoc
index 7c98792..7bdc5b1 100644
--- a/core/_adoc-fis/modules/ROOT/pages/application-layer.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer.adoc
@@ -24,7 +24,7 @@ Impl'n (g: a:)
 
 
 
-|xref:fis:ROOT:application-layer/AuthenticationSessionProvider.adoc[`o.a.i.core.commons.` +
+|xref:runtime-services:ROOT:application-layer/AuthenticationSessionProvider.adoc[`o.a.i.core.commons.` +
 `authentication.` +
 `AuthenticationSessionProvider`]
 |Simply responsible for obtaining the current `AuthenticationSession` (the framework's internal representation of the currently logged-in user).
@@ -34,7 +34,7 @@ Impl'n (g: a:)
 |Default implementation looks up from `IsisSessionFactory` singleton's thread-local
 
 
-|xref:fis:ROOT:application-layer/CommandDtoServiceInternal.adoc[`o.a.i.c.m.s.command` +
+|xref:runtime-services:ROOT:application-layer/CommandDtoServiceInternal.adoc[`o.a.i.c.m.s.command` +
 `CommandDtoServiceInternal`]
 |Creates memento of current action invocation, for use as a serializable XML reified command.  The
 most notable usage of this is to allow the execution of the `Command` to be deferred to run in the background (via
@@ -46,7 +46,7 @@ xref:applib:ant:Property.adoc#command[`@Property#commandExecuteIn()`].
 |
 
 
-|xref:fis:ROOT:application-layer/InteractionDtoServiceInternal.adoc[`o.a.i.c.m.s.ixn` +
+|xref:runtime-services:ROOT:application-layer/InteractionDtoServiceInternal.adoc[`o.a.i.c.m.s.ixn` +
 `InteractionDtoServiceInternal`]
 |Creates DTO for the current execution of an action invocation or property edit, for use either as a reified command or for implementations of the xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`].
 |`CommandDtoService-` +
diff --git a/core/_adoc-fis/modules/ROOT/pages/application-layer/AuthenticationSessionProvider.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/AuthenticationSessionProvider.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/application-layer/AuthenticationSessionProvider.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/application-layer/AuthenticationSessionProvider.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc
similarity index 96%
rename from core/_adoc-fis/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc
index 0fa67d8..3d8e561 100644
--- a/core/_adoc-fis/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/CommandDtoServiceInternal.adoc
@@ -51,5 +51,5 @@ The SPI is implemented by `o.a.i.c.r.s.command.CommandDtoServiceInternalServiceD
 == Related Services
 
 The design of this service is similar to that of
-xref:fis:ROOT:application-layer/InteractionDtoServiceInternal.adoc[`InteractionDtoServiceInternal`], used to create the
+xref:runtime-services:ROOT:application-layer/InteractionDtoServiceInternal.adoc[`InteractionDtoServiceInternal`], used to create the
 `MemberExecutionDto` (from the xref:schema:ROOT:ixn.adoc["ixn" schema]).
diff --git a/core/_adoc-fis/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc
similarity index 95%
rename from core/_adoc-fis/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc
index 7de1336..65a4712 100644
--- a/core/_adoc-fis/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/InteractionDtoServiceInternal.adoc
@@ -38,5 +38,5 @@ The service is implemented by `o.a.i.core.runtime.services.ixn.InteractionDtoSer
 == Related Services
 
 The design of this service is similar to that of
-xref:fis:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`], used to create the `CommandDto`
+xref:runtime-services:ROOT:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`], used to create the `CommandDto`
 (from the xref:schema:ROOT:cmd.adoc["cmd" schema]).
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/application-layer/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/application-layer/_attributes.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer.adoc
similarity index 77%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer.adoc
index 129b5e8..697a02b 100644
--- a/core/_adoc-fis/modules/ROOT/pages/persistence-layer.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer.adoc
@@ -24,23 +24,23 @@ Impl'n (g: a:)
 
 
 
-|xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`o.a.i.c.r.s.auditing.` +
+|xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`o.a.i.c.r.s.auditing.` +
 `AuditingServiceInternal`]
 |Co-ordinates between
-xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
-xref:fis:ROOT:spi/AuditerService.adoc[`AuditerService`].
+xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
+xref:runtime-services:ROOT:spi/AuditerService.adoc[`AuditerService`].
 |concrete class.
 |
 
 
-|xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`o.a.i.c.r.s.changes.` +
+|xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`o.a.i.c.r.s.changes.` +
 `ChangedObjectsServiceInternal`]
 |Request-scoped service holding objects enlisted into current transaction.
 |concrete class.
 |
 
 
-|xref:fis:ROOT:persistence-layer/PersistenceSessionServiceInternal.adoc[`o.a.i.c.m.s.` +
+|xref:runtime-services:ROOT:persistence-layer/PersistenceSessionServiceInternal.adoc[`o.a.i.c.m.s.` +
 `persistsession.` +
 `PersistenceSessionServiceInternal`]
 |Acts as a facade to the underlying JDO persistence session / database connection.  As such it provides methods for
@@ -51,10 +51,10 @@ querying and for persisting objects.
 |
 
 
-|xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`o.a.i.c.m.s.publishing.` +
+|xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`o.a.i.c.m.s.publishing.` +
 `PublishingServiceInternal`]
 |Co-ordinates between
-xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
+xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
 xref:applib:svc:persistence-layer-api/MetricsService.adoc[`MetricsService`] and the SPI services, and the
 xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`].
 |`PublishingService-` +
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc
similarity index 70%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc
index 3e2c617..a279f3f 100644
--- a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/AuditingServiceInternal.adoc
@@ -21,7 +21,7 @@ public class AuditingServiceInternal {
 }
 ----
 <1> minor performance optimization as to whether any auditing services are actually enabled; checks to see if any xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`] are enabled.
-<2> uses the xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s).
+<2> uses the xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s).
 
 The service implementation is `o.a.i.c.r.s.auditing.AuditingServiceInternal`.
 
@@ -34,7 +34,7 @@ Apache Isis' default implementation of `AuditingServiceInternal` class is automa
 
 == Related Classes
 
-The service delegates between the (internal) xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service  to the configured xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s).
+The service delegates between the (internal) xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service  to the configured xref:applib:svc:persistence-layer-spi/AuditerService.adoc[`AuditerService`](s).
 If no such service(s) are configured, then _this_ service is in effect a no-op.
 
-The (internal) xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] performs a similar function for the xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
+The (internal) xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] performs a similar function for the xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
similarity index 80%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
index aa3a34e..4c64a4b 100644
--- a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 
 
 The `ChangedObjectsServiceInternal` class is an (internal) request-scoped domain service that is responsible for collecting the details of all changes to domain objects within an interaction.
-This is then used by various other  (internal) domain services, notably xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`].
+This is then used by various other  (internal) domain services, notably xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`].
 
 
 
@@ -33,9 +33,9 @@ public class ChangedObjectsServiceInternal {
 ----
 <1> Enlists an object that has just been created, updated or deleted, capturing the pre-modification values of the properties.
 <2> Used by the framework to determine whether to set the "persist hint" on the `Command` object (as per xref:applib:svc:application-layer-api/CommandContext.adoc[`CommandContext`]).
-<3> Used by xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] to obtain details of and
+<3> Used by xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] to obtain details of and
 counters of all objects changed within the transaction.
-<4> Used by xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] to obtain all pairs of
+<4> Used by xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] to obtain all pairs of
 pre/post values of changed properties
 <5> Called by the framework to for clean up after auditing and publishing has completed.
 
@@ -56,4 +56,4 @@ Apache Isis' default implementation of `ChangedObjectsServiceInternal` class is
 
 == Related Classes
 
-Both the xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:fis:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] (internal) domain services query this object.
+Both the xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:runtime-services:ROOT:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] (internal) domain services query this object.
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/PersistenceSessionServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc
similarity index 79%
rename from core/_adoc-fis/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc
index 192ff9c..f706242 100644
--- a/core/_adoc-fis/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/PublishingServiceInternal.adoc
@@ -7,7 +7,7 @@ The (internal) `PublishingServiceInternal` domain service acts as an internal fa
 
 For published action invocations/ property edits, it provides an API for those member executions to call.
 
-For published objects, it provides an API for the framework to call at the end of the interaction; it obtains details of the changed objects (from the xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`]) and filters them to just those objects that are to be published; these are then passed through to any configured `PublisherService` implementations.
+For published objects, it provides an API for the framework to call at the end of the interaction; it obtains details of the changed objects (from the xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`]) and filters them to just those objects that are to be published; these are then passed through to any configured `PublisherService` implementations.
 
 
 == SPI and Implementation
@@ -44,6 +44,6 @@ To use an alternative implementation, use xref:applib:ant:DomainServiceLayout.ad
 
 == Related Classes
 
-The service delegates between the (internal) xref:fis:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service to the configured xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`].
+The service delegates between the (internal) xref:runtime-services:ROOT:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service to the configured xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`].
 
-The (internal) xref:fis:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] performs a similar function for the xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
+The (internal) xref:runtime-services:ROOT:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] performs a similar function for the xref:applib:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
diff --git a/core/_adoc-fis/modules/ROOT/pages/application-layer/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/application-layer/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/persistence-layer/_attributes.adoc
diff --git a/core/_adoc-fis/modules/ROOT/pages/presentation-layer.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer.adoc
similarity index 88%
rename from core/_adoc-fis/modules/ROOT/pages/presentation-layer.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer.adoc
index 415f7e2..af5a116 100644
--- a/core/_adoc-fis/modules/ROOT/pages/presentation-layer.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer.adoc
@@ -24,7 +24,7 @@ Impl'n (g: a:)
 |Notes
 
 
-|xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`o.a.i.v.ro.` +
+|xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`o.a.i.v.ro.` +
 `rendering.service.conneg.` +
 `ContentNegotiationService`]
 |Encodes the algorithm that delegates to any registered xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`]s.
@@ -35,10 +35,10 @@ Impl'n (g: a:)
 |
 
 
-|xref:fis:ROOT:presentation-layer/RepresentationService.adoc[`o.a.i.v.ro.` +
+|xref:runtime-services:ROOT:presentation-layer/RepresentationService.adoc[`o.a.i.v.ro.` +
 `rendering.service.` +
 `RepresentationService`]
-|Generates the representations, delegating to any registered xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`]s.
+|Generates the representations, delegating to any registered xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`]s.
 |`RepresentationService-` +
 `ForRestfulObjects` +
 ``o.a.i.core`` +
diff --git a/core/_adoc-fis/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc
similarity index 98%
rename from core/_adoc-fis/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc
index ec51cc7..abc225c 100644
--- a/core/_adoc-fis/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/ContentNegotiationService.adoc
@@ -201,4 +201,4 @@ To use an alternative implementation, use xref:applib:ant:DomainServiceLayout.ad
 
 The default implementation of `ContentNegotiationService` delegates to xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] (if present) to convert domain entities into a stable form (eg DTO).
 
-The `ContentNegotiationService` is itself called by the (default implementation of) xref:fis:ROOT:presentation-layer/RepresentationService.adoc[`RepresentationService`].
\ No newline at end of file
+The `ContentNegotiationService` is itself called by the (default implementation of) xref:runtime-services:ROOT:presentation-layer/RepresentationService.adoc[`RepresentationService`].
\ No newline at end of file
diff --git a/core/_adoc-fis/modules/ROOT/pages/presentation-layer/RepresentationService.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/RepresentationService.adoc
similarity index 80%
rename from core/_adoc-fis/modules/ROOT/pages/presentation-layer/RepresentationService.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/RepresentationService.adoc
index d6aecd2..b20dae3 100644
--- a/core/_adoc-fis/modules/ROOT/pages/presentation-layer/RepresentationService.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/RepresentationService.adoc
@@ -8,10 +8,10 @@ include::_attributes.adoc[]
 The `RepresentationService` is the main plug-in point for the xref:vro:ROOT:about.adoc[RestfulObjects viewer] to generate representations.
 
 The default implementations ultimately generate representations according to the link:http://restfulobjects.org[Restful Objects spec] v1.0.
-However, it also delegates to the xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] which provides a mechanism for altering representations according to the HTTP `Accept` header.
+However, it also delegates to the xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] which provides a mechanism for altering representations according to the HTTP `Accept` header.
 This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.
 
-In all there are three domain services that can influence the representations generated: this service, xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and the xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`].
+In all there are three domain services that can influence the representations generated: this service, xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and the xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`].
 The diagram below shows how these collaborate:
 
 image::RepresentationService/service-collaborations.png[width="700px",link="{imagesdir}/RepresentationService/service-collaborations.png"]
@@ -77,7 +77,7 @@ ie `MemberReprMode`
 == Implementation
 
 As discussed in the introduction, the framework provides a default implementation, `o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator`.
-This delegates to xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the link:http://restfulobjects.org[Restful Objects spec] v1.0.
+This delegates to xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the link:http://restfulobjects.org[Restful Objects spec] v1.0.
 
 To use an alternative implementation, use xref:applib:ant:DomainServiceLayout.adoc#menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained in the xref:applib:svc:intro/overriding-the-services.adoc[introduction] to this guide).
 
@@ -90,4 +90,4 @@ Apache Isis' default implementation of `RepresentationService` service is automa
 
 == Related Services
 
-The default implementation delegates to xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], whose default implementation may delegate in turn to xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] (if present).
\ No newline at end of file
+The default implementation delegates to xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], whose default implementation may delegate in turn to xref:applib:svc:presentation-layer-spi/ContentMappingService.adoc[`ContentMappingService`] (if present).
\ No newline at end of file
diff --git a/core/_adoc-fis/modules/ROOT/pages/_partials/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/_attributes.adoc
similarity index 100%
rename from core/_adoc-fis/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/runtime-services/_adoc/modules/ROOT/pages/presentation-layer/_attributes.adoc
diff --git a/core/_adoc-fis/sync_examples.sh b/core/runtime-services/_adoc/sync_examples.sh
similarity index 100%
rename from core/_adoc-fis/sync_examples.sh
rename to core/runtime-services/_adoc/sync_examples.sh
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
index c975cd1..a8ef061 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/architecture.adoc
@@ -15,7 +15,7 @@ the `Content-Type` header which the client can use to know how to process the re
 
 * `RepresentationService` +
 +
-The xref:fis:ROOT:presentation-layer/RepresentationService.adoc[`RepresentationService`] is an SPI domain service (plugin-point)
+The xref:runtime-services:ROOT:presentation-layer/RepresentationService.adoc[`RepresentationService`] is an SPI domain service (plugin-point)
 that allows an arbitrary representation to be generated for any of the resources defined in the RO spec. +
 +
 Normally this SPI service need not be replaced, because the default implementation
@@ -27,7 +27,7 @@ is able to handle the request (per the chain of responsibliity pattern).
 * `ContentNegotiationService` +
 +
 As noted above, there can be multiple implementations of the
-xref:fis:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], each one handling a particular
+xref:runtime-services:ROOT:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], each one handling a particular
 HTTP `Accept` header.  If the implementation does not recognize the value of the header, if can simply return `null`. +
 +
 The framework provides a number of implementations; an implementation that handles the
diff --git a/site.yml b/site.yml
index 93e5bf6..0184fa5 100644
--- a/site.yml
+++ b/site.yml
@@ -29,7 +29,7 @@ content:
       start_path: antora/components/archdesign
 
     - url: .
-      start_path: core/_adoc-ug
+      start_path: antora/components/userguide
       branches: HEAD
     - url: .
       branches: HEAD
@@ -50,6 +50,10 @@ content:
       branches: HEAD
 
     - url: .
+      start_path: core/runtime-services/_adoc
+      branches: HEAD
+
+    - url: .
       start_path: core/testsupport/_adoc
       branches: HEAD
     - url: .