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

[isis] 16/22: ISIS-2259: moves runtime.services package to runtimeservices (to align packages with artifactId, avoid split packages).

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

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

commit 16d6b5cd02e09acf21a182b2b5e626447729988c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:41:12 2020 +0000

    ISIS-2259: moves runtime.services package to runtimeservices (to align packages with artifactId, avoid split packages).
---
 .../proxy/ProxyCreatorTestUsingCodegenPlugin.java  |  4 +-
 .../WrapperFactoryDefault_wrappedObject_Test.java  |  8 ++--
 ...actoryDefault_wrappedObject_transient_Test.java |  4 +-
 .../InitialisationException.java                   |  2 +-
 .../IsisModuleRuntimeServices.java                 | 54 +++++++++++-----------
 .../ServiceException.java                          |  2 +-
 .../auth/AuthenticationSessionProviderDefault.java |  2 +-
 .../background/BackgroundCommandExecution.java     |  2 +-
 .../background/CommandExecutionAbstract.java       |  2 +-
 .../bookmarks/BookmarkServiceInternalDefault.java  |  2 +-
 .../command/CommandDtoServiceInternalDefault.java  |  2 +-
 .../command/CommandExecutorServiceDefault.java     |  2 +-
 .../command/CommandServiceDefault.java             |  2 +-
 .../confmenu/ConfigurationViewServiceDefault.java  |  2 +-
 .../email/EmailServiceDefault.java                 |  2 +-
 .../error/EmailTicket.java                         |  2 +-
 .../error/SimpleTicket.java                        |  2 +-
 .../eventbus/EventBusServiceSpring.java            |  2 +-
 .../factory/FactoryServiceDefault.java             |  2 +-
 .../homepage/HomePageResolverServiceDefault.java   |  2 +-
 .../i18n/po/Block.java                             |  2 +-
 .../i18n/po/ContextAndMsgId.java                   |  2 +-
 .../i18n/po/PoAbstract.java                        |  2 +-
 .../i18n/po/PoDisabled.java                        |  2 +-
 .../i18n/po/PoReader.java                          |  2 +-
 .../i18n/po/PoWriter.java                          |  2 +-
 .../i18n/po/TranslationServicePo.java              |  2 +-
 .../i18n/po/TranslationServicePoMenu.java          |  2 +-
 .../services => runtimeservices}/i18n/po/Util.java |  2 +-
 .../ixn/InteractionDtoServiceInternalDefault.java  |  2 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |  2 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |  2 +-
 .../menubars/bootstrap3/ServiceAndAction.java      |  2 +-
 .../message/MessageServiceDefault.java             |  2 +-
 .../publish/PublishedObjectsDefault.java           |  2 +-
 .../publish/PublisherDispatchServiceDefault.java   |  2 +-
 .../repository/RepositoryServiceDefault.java       |  2 +-
 .../routing/RoutingServiceDefault.java             |  2 +-
 .../sessmgmt/SessionManagementServiceDefault.java  |  2 +-
 .../sudo/SudoServiceDefault.java                   |  2 +-
 .../userprof/UserProfileServiceDefault.java        |  2 +-
 .../userreg/EmailNotificationServiceDefault.java   |  2 +-
 .../userreg/EmailVerificationTemplate.html         |  0
 .../userreg/PasswordResetTemplate.html             |  0
 .../wrapper/AsyncWrapDefault.java                  |  2 +-
 .../wrapper/WrapperFactoryDefault.java             | 12 ++---
 .../dispatchers/InteractionEventDispatcher.java    |  2 +-
 .../InteractionEventDispatcherTypeSafe.java        |  2 +-
 .../AbstractCollectionInvocationHandler.java       |  2 +-
 .../handlers/CollectionInvocationHandler.java      |  2 +-
 .../handlers/DelegatingInvocationHandler.java      |  2 +-
 .../DelegatingInvocationHandlerDefault.java        |  2 +-
 .../handlers/DomainObjectInvocationHandler.java    |  2 +-
 .../wrapper/handlers/MapInvocationHandler.java     |  2 +-
 .../wrapper/handlers/ProxyContextHandler.java      |  4 +-
 .../wrapper/internal/util/MethodPrefixFinder.java  |  2 +-
 .../wrapper/proxy/ProxyCreator.java                |  4 +-
 .../xactn/TransactionServiceSpring.java            |  2 +-
 .../xmlsnapshot/XmlSnapshotBuilder.java            |  2 +-
 .../xmlsnapshot/XmlSnapshotServiceDefault.java     |  2 +-
 .../ServiceInstantiatorTest.java                   |  2 +-
 .../changes/PreAndPostValues_shouldAudit_Test.java |  2 +-
 .../email/EmailServiceDefaultTest_actually.java    |  2 +-
 .../email/EmailServiceDefaultTest_notEmpty.java    |  2 +-
 .../i18n/po/PoReaderTest.java                      |  2 +-
 .../i18n/po/PoWriterTest_escape.java               |  2 +-
 .../wrapper/WrapperFactoryDefaultTest.java         |  2 +-
 .../wrapper/dom/claims/Approver.java               |  2 +-
 .../wrapper/dom/claims/Claimant.java               |  2 +-
 .../wrapper/dom/employees/Employee.java            |  6 +--
 .../wrapper/dom/employees/EmployeeRepository.java  |  2 +-
 .../dom/employees/EmployeeRepositoryImpl.java      |  2 +-
 .../security/bypass/IsisModuleSecurityBypass.java  |  2 +-
 .../keycloak/IsisModuleSecurityKeycloak.java       |  2 +-
 .../security/shiro/IsisModuleSecurityShiro.java    |  2 +-
 .../webboot/springboot/IsisModuleSpringBoot.java   |  2 +-
 .../error/service/DemoErrorReportingService.java   |  4 +-
 .../SpringServiceInjectOrderTest.java              |  2 +-
 .../eventhandling/GenericEventPublishingTest.java  |  2 +-
 79 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index 50960e9..d950a77 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -27,8 +27,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.runtime.services.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
 
 public class ProxyCreatorTestUsingCodegenPlugin {
 
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
similarity index 98%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index eec5c5a..eca3bef 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -66,9 +66,9 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.specimpl.OneToOneAssociationDefault;
 import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
-import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepository;
-import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepositoryImpl;
+import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
+import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepository;
+import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.schema.cmd.v1.CommandDto;
 import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
similarity index 98%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index c862c26..f3d9137 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -63,7 +63,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
+import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
 import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
index 5d18f92..599e89f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
 
 import org.apache.isis.commons.exceptions.IsisException;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
similarity index 54%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index 57ab7f9..0244366 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -16,39 +16,39 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
 import org.apache.isis.runtime.IsisModuleRuntime;
-import org.apache.isis.runtime.services.auth.AuthenticationSessionProviderDefault;
-import org.apache.isis.runtime.services.bookmarks.BookmarkServiceInternalDefault;
-import org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault;
-import org.apache.isis.runtime.services.command.CommandExecutorServiceDefault;
-import org.apache.isis.runtime.services.command.CommandServiceDefault;
-import org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault;
-import org.apache.isis.runtime.services.email.EmailServiceDefault;
-import org.apache.isis.runtime.services.eventbus.EventBusServiceSpring;
-import org.apache.isis.runtime.services.factory.FactoryServiceDefault;
-import org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault;
-import org.apache.isis.runtime.services.i18n.po.TranslationServicePo;
-import org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu;
-import org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault;
-import org.apache.isis.runtime.services.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.runtime.services.menubars.bootstrap3.MenuBarsServiceBS3;
-import org.apache.isis.runtime.services.message.MessageServiceDefault;
-import org.apache.isis.runtime.services.publish.PublisherDispatchServiceDefault;
-import org.apache.isis.runtime.services.repository.RepositoryServiceDefault;
-import org.apache.isis.runtime.services.routing.RoutingServiceDefault;
-import org.apache.isis.runtime.services.sessmgmt.SessionManagementServiceDefault;
-import org.apache.isis.runtime.services.sudo.SudoServiceDefault;
-import org.apache.isis.runtime.services.userprof.UserProfileServiceDefault;
-import org.apache.isis.runtime.services.userreg.EmailNotificationServiceDefault;
-import org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault;
-import org.apache.isis.runtime.services.xactn.TransactionServiceSpring;
-import org.apache.isis.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault;
+import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
+import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
+import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
+import org.apache.isis.runtimeservices.command.CommandExecutorServiceDefault;
+import org.apache.isis.runtimeservices.command.CommandServiceDefault;
+import org.apache.isis.runtimeservices.confmenu.ConfigurationViewServiceDefault;
+import org.apache.isis.runtimeservices.email.EmailServiceDefault;
+import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
+import org.apache.isis.runtimeservices.factory.FactoryServiceDefault;
+import org.apache.isis.runtimeservices.homepage.HomePageResolverServiceDefault;
+import org.apache.isis.runtimeservices.i18n.po.TranslationServicePo;
+import org.apache.isis.runtimeservices.i18n.po.TranslationServicePoMenu;
+import org.apache.isis.runtimeservices.ixn.InteractionDtoServiceInternalDefault;
+import org.apache.isis.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
+import org.apache.isis.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.runtimeservices.message.MessageServiceDefault;
+import org.apache.isis.runtimeservices.publish.PublisherDispatchServiceDefault;
+import org.apache.isis.runtimeservices.repository.RepositoryServiceDefault;
+import org.apache.isis.runtimeservices.routing.RoutingServiceDefault;
+import org.apache.isis.runtimeservices.sessmgmt.SessionManagementServiceDefault;
+import org.apache.isis.runtimeservices.sudo.SudoServiceDefault;
+import org.apache.isis.runtimeservices.userprof.UserProfileServiceDefault;
+import org.apache.isis.runtimeservices.userreg.EmailNotificationServiceDefault;
+import org.apache.isis.runtimeservices.wrapper.WrapperFactoryDefault;
+import org.apache.isis.runtimeservices.xactn.TransactionServiceSpring;
+import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
 
 @Configuration
 @Import({
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
index 3caeb87..d20a545 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
 
 import org.apache.isis.commons.exceptions.IsisException;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 0ed138b..37bd600 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.auth;
+package org.apache.isis.runtimeservices.auth;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
index 80ca677..0568e95 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.background;
+package org.apache.isis.runtimeservices.background;
 
 import java.util.List;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
index 805aae9..dfe64eb 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.background;
+package org.apache.isis.runtimeservices.background;
 
 import javax.inject.Inject;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
index dccfc2f..03a2a3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.bookmarks;
+package org.apache.isis.runtimeservices.bookmarks;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 92d7842..ad108e5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
index 4be9b2d..35fce72 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
 
 import java.sql.Timestamp;
 import java.util.Collections;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
index 185f6db..bcf00a9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
 
 import javax.inject.Named;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index 6b60725..1e96445 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.confmenu;
+package org.apache.isis.runtimeservices.confmenu;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
index 5914a94..29bd176 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
index 5deeec2..7a614d5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.error;
+package org.apache.isis.runtimeservices.error;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
index a853f04..6af43ad 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.error;
+package org.apache.isis.runtimeservices.error;
 
 import java.io.Serializable;
 import java.util.function.UnaryOperator;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
index d6eb8c8..e77b40e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.eventbus;
+package org.apache.isis.runtimeservices.eventbus;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
index a8144c5..67cc20f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.factory;
+package org.apache.isis.runtimeservices.factory;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
index bf3cd28..04d5ab0 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.homepage;
+package org.apache.isis.runtimeservices.homepage;
 
 import javax.enterprise.inject.Vetoed;
 import javax.inject.Inject;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
index c721332..c018560 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
index d423f66..b5d66f0 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 /**
  * The combination of a <tt>msgId</tt> and context (optionally null) that represents a key to a translatable resource.
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
index 92ccd71..bd86875 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
index 2d202a7..7111db8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import org.apache.isis.applib.services.i18n.TranslationService;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
index bec4f5c..d6eb2db 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
index c5c33a1..b84ba12 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import java.util.SortedMap;
 import java.util.SortedSet;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
index 79556a6..b7c9138 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
index 8c739e1..38950e4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
similarity index 95%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
index c712186..da2db3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 class Util {
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
index 4c6b716..6dddd4d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.ixn;
+package org.apache.isis.runtimeservices.ixn;
 
 import java.util.List;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 4d6f63c..878ca0d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.menubars;
+package org.apache.isis.runtimeservices.menubars;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index dd2a14a..1dc15c9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.menubars.bootstrap3;
+package org.apache.isis.runtimeservices.menubars.bootstrap3;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
index 03a2268..1b360ce 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.menubars.bootstrap3;
+package org.apache.isis.runtimeservices.menubars.bootstrap3;
 
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.ObjectAction;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
index 192335b..181ca15 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.message;
+package org.apache.isis.runtimeservices.message;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
index 1647af4..0969202 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.publish;
+package org.apache.isis.runtimeservices.publish;
 
 import java.sql.Timestamp;
 import java.util.Collection;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
index 42e67c4..8f95fee 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.publish;
+package org.apache.isis.runtimeservices.publish;
 
 import java.sql.Timestamp;
 import java.util.HashMap;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index 5abaf36..e4b7ba5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.repository;
+package org.apache.isis.runtimeservices.repository;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
index 72ba62f..df25030 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.routing;
+package org.apache.isis.runtimeservices.routing;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index 9bc41b6..27356bc 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.sessmgmt;
+package org.apache.isis.runtimeservices.sessmgmt;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
index 3853366..84cf6a1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.sudo;
+package org.apache.isis.runtimeservices.sudo;
 
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
index 1ec4c69..977b668 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.userprof;
+package org.apache.isis.runtimeservices.userprof;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
index 19554b8..9866800 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.userreg;
+package org.apache.isis.runtimeservices.userreg;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailVerificationTemplate.html b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailVerificationTemplate.html
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/PasswordResetTemplate.html b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/PasswordResetTemplate.html
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
index 24ec086..e24da35 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
 
 import java.util.EnumSet;
 import java.util.concurrent.Callable;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
index 91ea3b8..dc06598 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,10 +64,10 @@ import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
 import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcher;
-import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
-import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
+import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
+import org.apache.isis.runtimeservices.wrapper.handlers.ProxyContextHandler;
+import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 
 import lombok.val;
@@ -93,7 +93,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
     @Inject protected ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
 
     private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
-    private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher> 
+    private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher>
         dispatchersByEventClass = 
             new HashMap<Class<? extends InteractionEvent>, InteractionEventDispatcher>();
     private ProxyContextHandler proxyContextHandler;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 94%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
index 08189e8..3a083f1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dispatchers;
+package org.apache.isis.runtimeservices.wrapper.dispatchers;
 
 import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 95%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
index 37704d4..defcce3 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dispatchers;
+package org.apache.isis.runtimeservices.wrapper.dispatchers;
 
 import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
 import org.apache.isis.commons.internal.base._Casts;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
index edc6bae..a66c54f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.lang.reflect.Method;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
index df8c225..8c20a71 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 94%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
index 5918475..333028b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.lang.reflect.InvocationHandler;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index a336b9e..ee9a795 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index c35e77f..933073d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
index 91cb05c..1596845 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.util.Map;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
index 3c678c1..c8fcd4e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
 
 import java.util.Collection;
 import java.util.EnumSet;
@@ -26,7 +26,7 @@ import java.util.Map;
 import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
 import org.apache.isis.metamodel.context.MetaModelContext;
 import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
index 3846a3b..42f33fd 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.internal.util;
+package org.apache.isis.runtimeservices.wrapper.internal.util;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
index d5b26c5..621b355 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.proxy;
+package org.apache.isis.runtimeservices.wrapper.proxy;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
@@ -31,7 +31,7 @@ import org.apache.isis.commons.internal.collections._Arrays;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
 import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.runtime.services.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
index b9f2e7b..bd15d3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.xactn;
+package org.apache.isis.runtimeservices.xactn;
 
 import java.util.function.Supplier;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
index abcb347..5066eef 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.xmlsnapshot;
+package org.apache.isis.runtimeservices.xmlsnapshot;
 
 import java.util.List;
 
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index d23696b..5b57ff1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.xmlsnapshot;
+package org.apache.isis.runtimeservices.xmlsnapshot;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
index 59d835d..8dbbb05 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
 
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
similarity index 97%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index f90e0c3..779b6c7 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.changes;
+package org.apache.isis.runtimeservices.changes;
 
 import org.junit.Test;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
similarity index 97%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
index 7a3fcf3..885ecbb 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
 
 import org.junit.Test;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
index de36c41..c7a2141 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
 
 import org.junit.Test;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
similarity index 99%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
index 3507877..72a008d 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
index b0c17b7..f7902ec 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
 
 import org.junit.Test;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
similarity index 98%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index 1ff7e7f..082507e 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
 
 import java.util.EnumSet;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
index ee917b4..16642f2 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dom.claims;
+package org.apache.isis.runtimeservices.wrapper.dom.claims;
 
 public interface Approver {
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
index 680da54..20046ae 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dom.claims;
+package org.apache.isis.runtimeservices.wrapper.dom.claims;
 
 public interface Claimant {
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
similarity index 92%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
index b7ce646..d0032d3 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
@@ -17,11 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
 
 import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.runtime.services.wrapper.dom.claims.Approver;
-import org.apache.isis.runtime.services.wrapper.dom.claims.Claimant;
+import org.apache.isis.runtimeservices.wrapper.dom.claims.Approver;
+import org.apache.isis.runtimeservices.wrapper.dom.claims.Claimant;
 
 public class Employee implements Claimant, Approver {
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
index cf8b86c..b22e728 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
 
 import java.util.List;
 
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 94%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
index e05cf4a..7c7a065 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
 
 import java.util.List;
 
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
index d2e3864..1e25327 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.bypass;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
 import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
 import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
 
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 6e83e67..b5cd8be 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.keycloak;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
 import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
 import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
 import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 6ad9da3..63dc32f 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.shiro;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
 import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
 import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
 import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
diff --git a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
index 1dfe1a6..a5b7c28 100644
--- a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
+++ b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
-import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
 
 @Configuration
 @Import({
diff --git a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
index 1883115..2b96276 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
+++ b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.services.error.ErrorDetails;
 import org.apache.isis.applib.services.error.ErrorReportingService;
 import org.apache.isis.applib.services.error.Ticket;
 import org.apache.isis.applib.services.error.Ticket.StackTracePolicy;
-import org.apache.isis.runtime.services.error.EmailTicket;
-import org.apache.isis.runtime.services.error.EmailTicket.MailTo;
+import org.apache.isis.runtimeservices.error.EmailTicket;
+import org.apache.isis.runtimeservices.error.EmailTicket.MailTo;
 
 import lombok.val;
 
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 0e6d120..6ba2113 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.runtime.services.message.MessageServiceDefault;
+import org.apache.isis.runtimeservices.message.MessageServiceDefault;
 import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_headless;
 
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
index bd4afe0..54f6aea 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtime.services.eventbus.EventBusServiceSpring;
+import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
 
 import lombok.Getter;
 import lombok.Value;