You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/10/04 18:13:26 UTC

(cayenne) 01/02: moving CayenneRuntime to the root package

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

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit a893cad927448a699b6f3b0453c2fcf65010d69d
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sun Oct 4 13:59:18 2026 -0400

    moving CayenneRuntime to the root package
---
 UPGRADE.md                                                        | 4 ++--
 ai-plugin/references/runtime-api.md                               | 8 ++++----
 .../cache/invalidation/CacheInvalidationModuleProvider.java       | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../apache/cayenne/cache/invalidation/CacheInvalidationCase.java  | 4 ++--
 .../invalidation/CayenneCacheInvalidationModuleProviderTest.java  | 2 +-
 .../main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java  | 2 +-
 .../test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java  | 2 +-
 .../test/java/org/apache/cayenne/crypto/Runtime_LazyInit_IT.java  | 2 +-
 .../transformer/value/DefaultValueTransformerFactoryIT.java       | 2 +-
 .../test/java/org/apache/cayenne/crypto/unit/CryptoUnitUtils.java | 2 +-
 .../main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java  | 2 +-
 .../src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java  | 2 +-
 .../org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java    | 2 +-
 .../main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java     | 2 +-
 .../apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java    | 2 +-
 .../java/org/apache/cayenne/project/ProjectModuleProvider.java    | 2 +-
 .../org/apache/cayenne/project/extension/ProjectExtension.java    | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../org/apache/cayenne/project/ProjectModuleProviderTest.java     | 2 +-
 .../java/org/apache/cayenne/velocity/VelocityModuleProvider.java  | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 .../org/apache/cayenne/velocity/VelocityModuleProviderTest.java   | 2 +-
 .../java/org/apache/cayenne/{runtime => }/CayenneRuntime.java     | 4 +---
 .../org/apache/cayenne/{runtime => }/CayenneRuntimeBuilder.java   | 6 ++----
 .../cayenne/{runtime => }/CayenneRuntimeModuleProvider.java       | 4 ++--
 cayenne/src/main/java/org/apache/cayenne/CoreModuleProvider.java  | 1 -
 .../java/org/apache/cayenne/configuration/RuntimeProperties.java  | 2 +-
 .../org/apache/cayenne/configuration/server/ServerRuntime.java    | 4 ++--
 .../main/java/org/apache/cayenne/tx/TransactionDescriptor.java    | 2 +-
 ...leProvider => org.apache.cayenne.CayenneRuntimeModuleProvider} | 0
 cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java       | 1 -
 cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java       | 1 -
 .../org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java | 1 -
 .../org/apache/cayenne/CayennePersistentObjectInContextIT.java    | 1 -
 .../apache/cayenne/CayennePersistentObjectRelationshipsIT.java    | 1 -
 .../apache/cayenne/CayennePersistentObjectSetToManyListIT.java    | 1 -
 .../org/apache/cayenne/{runtime => }/CayenneRuntimeBuilderIT.java | 4 +---
 .../apache/cayenne/{runtime => }/CayenneRuntimeBuilderTest.java   | 3 +--
 .../java/org/apache/cayenne/{runtime => }/CayenneRuntimeIT.java   | 3 +--
 .../cayenne/{runtime => }/CayenneRuntimeLazyStartupTest.java      | 4 +---
 .../java/org/apache/cayenne/{runtime => }/CayenneRuntimeTest.java | 4 +---
 .../src/test/java/org/apache/cayenne/CoreModuleProviderTest.java  | 1 -
 .../cayenne/access/DataContextEntityWithMeaningfulPKIT.java       | 2 +-
 .../apache/cayenne/access/DataContextFlattenedAttributesIT.java   | 2 +-
 .../java/org/apache/cayenne/access/DataContextLocalObjectIT.java  | 2 +-
 .../org/apache/cayenne/access/DataContextObjectTrackingIT.java    | 2 +-
 .../org/apache/cayenne/access/DataContextPrefetchMultistepIT.java | 2 +-
 .../apache/cayenne/access/DataContextSharedCacheEmpiricIT.java    | 2 +-
 .../src/test/java/org/apache/cayenne/access/DbGeneratorIT.java    | 2 +-
 .../org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java   | 2 +-
 .../src/test/java/org/apache/cayenne/access/JointPrefetchIT.java  | 2 +-
 .../cayenne/access/NestedDataContextParentPeerEventsIT.java       | 2 +-
 .../java/org/apache/cayenne/access/NestedDataContextReadIT.java   | 2 +-
 .../java/org/apache/cayenne/access/NestedDataContextWriteIT.java  | 2 +-
 .../org/apache/cayenne/access/NestedDataContext_DeadlockIT.java   | 2 +-
 .../src/test/java/org/apache/cayenne/access/NumericTypesIT.java   | 2 +-
 .../java/org/apache/cayenne/access/VerticalInheritanceIT.java     | 2 +-
 .../cayenne/access/VerticalInheritanceMultipleAttributesIT.java   | 2 +-
 .../cayenne/access/translator/batch/DeleteBatchTranslatorIT.java  | 2 +-
 .../cayenne/access/translator/batch/InsertBatchTranslatorIT.java  | 2 +-
 .../cayenne/access/translator/batch/UpdateBatchTranslatorIT.java  | 2 +-
 .../cayenne/access/translator/select/QualifierTranslatorIT.java   | 2 +-
 .../translator/sqltemplate/directive/ResultDirectiveIT.java       | 2 +-
 .../test/java/org/apache/cayenne/commitlog/CommitLogFilterIT.java | 2 +-
 .../apache/cayenne/commitlog/CommitLogFilter_All_FlattenedIT.java | 2 +-
 .../org/apache/cayenne/commitlog/CommitLogFilter_FilteredIT.java  | 2 +-
 .../commitlog/CommitLogFilter_ListenerInducedChangesIT.java       | 2 +-
 .../org/apache/cayenne/commitlog/CommitLogFilter_OutsideTxIT.java | 2 +-
 .../apache/cayenne/commitlog/CommitLogFilter_PreUpdate_IT.java    | 2 +-
 .../cayenne/commitlog/CommitLogFilter_PreUpdate_OutsideTxIT.java  | 2 +-
 .../java/org/apache/cayenne/commitlog/CommitLogFilter_TxIT.java   | 2 +-
 .../org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java   | 4 ++--
 .../org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java   | 4 ++--
 .../cayenne/configuration/runtime/DataDomainProviderIT.java       | 2 +-
 .../cayenne/configuration/runtime/DefaultDataNodeFactoryIT.java   | 4 ++--
 .../test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java | 2 +-
 cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java    | 2 +-
 .../src/test/java/org/apache/cayenne/map/DbRelationshipIT.java    | 2 +-
 .../src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java   | 2 +-
 .../src/test/java/org/apache/cayenne/query/ColumnSelectIT.java    | 2 +-
 .../java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java    | 2 +-
 .../org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java  | 2 +-
 .../java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java | 2 +-
 .../test/java/org/apache/cayenne/tx/TransactionIsolationIT.java   | 2 +-
 .../org/apache/cayenne/tx/TransactionPropagationRollbackIT.java   | 2 +-
 .../src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java    | 2 +-
 .../src/test/java/org/apache/cayenne/unit/DbSchemaManager.java    | 2 +-
 .../java/org/apache/cayenne/unit/telemetry/TestTelemetry.java     | 2 +-
 .../java/org/apache/cayenne/util/ShallowMergeOperationIT.java     | 2 +-
 docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/starting.adoc | 2 +-
 .../src/test/java/org/apache/cayenne/docs/BaseTest.java           | 2 +-
 .../test/java/org/apache/cayenne/docs/CacheInvalidationTest.java  | 2 +-
 .../src/test/java/org/apache/cayenne/docs/CommitLogTest.java      | 2 +-
 .../src/test/java/org/apache/cayenne/docs/CryptoExamples.java     | 2 +-
 .../src/test/java/org/apache/cayenne/docs/CustomizeTest.java      | 2 +-
 .../src/test/java/org/apache/cayenne/docs/JCacheExamples.java     | 2 +-
 .../src/test/java/org/apache/cayenne/docs/LifecycleTest.java      | 2 +-
 .../src/test/java/org/apache/cayenne/docs/StartingTest.java       | 2 +-
 .../src/main/java/org/example/cayenne/Main.java                   | 2 +-
 106 files changed, 102 insertions(+), 122 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 9a6fa0641e..7419f03317 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -651,10 +651,10 @@ DataMaps, filters and listeners can still be added (and removed) after creation.
   </dependency>
   ```
 
-* Per [CAY-2823](https://issues.apache.org/jira/browse/CAY-2823) `ServerRuntime` is deprecated. Use `org.apache.cayenne.runtime.CayenneRuntime` instead.
+* Per [CAY-2823](https://issues.apache.org/jira/browse/CAY-2823) `ServerRuntime` is deprecated. Use `org.apache.cayenne.CayenneRuntime` instead.
 
 * Per [CAY-2824](https://issues.apache.org/jira/browse/CAY-2824) `CayenneServerModuleProvider` was renamed to `CayenneRuntimeModuleProvider` and moved to
-  the `org.apache.cayenne.runtime` package. If you are using the auto-loading mechanism for your custom
+  the `org.apache.cayenne` package. If you are using the auto-loading mechanism for your custom
   modules, update your `META-INF/services` reference accordingly.
 
 * Per [CAY-2825](https://issues.apache.org/jira/browse/CAY-2825) Package `org.apache.cayenne.configuration.server` was renamed to
diff --git a/ai-plugin/references/runtime-api.md b/ai-plugin/references/runtime-api.md
index edfdb1969f..44cfc36a8d 100644
--- a/ai-plugin/references/runtime-api.md
+++ b/ai-plugin/references/runtime-api.md
@@ -24,15 +24,15 @@ How to bootstrap Cayenne in a Java application and use `ObjectContext` for CRUD.
 
 ## CayenneRuntime — top-level container
 
-`org.apache.cayenne.runtime.CayenneRuntime` is the entry point. One per application lifetime (or per data domain in multi-DB setups).
+`org.apache.cayenne.CayenneRuntime` is the entry point. One per application lifetime (or per data domain in multi-DB setups).
 
 Two creation paths:
 
 ### 1. With a built-in connection pool
 
 ```java
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 
 CayenneRuntime runtime = CayenneRuntime.of()
         .addConfig("cayenne-mydb.xml")
@@ -62,7 +62,7 @@ This path is preferred in production — your existing DI framework manages the
 
 ### CayenneRuntimeBuilder methods
 
-From `cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java`:
+From `cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeBuilder.java`:
 
 | Method | Purpose |
 |---|---|
diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
index 43093fc489..457ef6e2d8 100644
--- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
+++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.cache.invalidation;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.di.Module;
 
diff --git a/cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
index 4b3d805ce2..8057248714 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CacheInvalidationCase.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.cache.invalidation;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.datasource.CayenneDataSource;
 import org.apache.cayenne.di.Module;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.test.jdbc.DbHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.junit.jupiter.api.AfterEach;
diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
index b49d35a4dd..8d12411dec 100644
--- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
+++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.cache.invalidation;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
index 27cf343102..6527c25939 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.di.Module;
 
diff --git a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
index 735791bc80..d4d84a7e49 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cayenne.crypto;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
index e287ad6160..32c367a2d1 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.crypto.key.JceksKeySourceTest;
 import org.apache.cayenne.datasource.CayenneDataSource;
 import org.apache.cayenne.di.Module;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.DbHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_LazyInit_IT.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_LazyInit_IT.java
index 4a781f0a09..3151816777 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_LazyInit_IT.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_LazyInit_IT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.crypto.key.KeySource;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
index b4c15bb541..8a2ab105cc 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactoryIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.transformer.value;
 import org.apache.cayenne.crypto.key.KeySource;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/CryptoUnitUtils.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/CryptoUnitUtils.java
index 2fbc274cf8..3339146f0f 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/CryptoUnitUtils.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/CryptoUnitUtils.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.crypto.unit;
 
 import org.apache.cayenne.crypto.key.KeySource;
 import org.apache.cayenne.crypto.transformer.bytes.Header;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
index 7aa012b5d2..78d0464a30 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cayenne.dbsync;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.di.Module;
 
 import java.util.Collection;
diff --git a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
index e4320b1e43..f5b886f184 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cayenne.dbsync;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
index 030565c845..b86ed2755d 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.EntityResolver;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
index 3e991df578..7b419baf97 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.dbsync.reverse.dbload;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.dbsync.model.DetectedDbEntity;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
index b304da6482..df69e4f8d4 100644
--- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
+++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.jcache;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.di.Module;
 
diff --git a/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
index 7043324eec..04fd7a3d5f 100644
--- a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
+++ b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.cache.QueryCache;
 import org.apache.cayenne.di.Binder;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
index 70ef1968be..feb4acb5fa 100644
--- a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
+++ b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.jcache;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
index 96e2879559..e667c9d0a0 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cayenne.project;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.di.Module;
 
 import java.util.Collection;
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/extension/ProjectExtension.java b/cayenne-project/src/main/java/org/apache/cayenne/project/extension/ProjectExtension.java
index 73f6ee66b2..e167a79699 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/extension/ProjectExtension.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/extension/ProjectExtension.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.configuration.ProjectNodeVisitor;
  * <p>DataMap XML file extension mechanics.</p>
  * <p>
  *     Can be used to enhance datamap.map.xml files with additional (really random) information.
- *     By default extensions not used by {@link org.apache.cayenne.runtime.CayenneRuntime}
+ *     By default extensions not used by {@link org.apache.cayenne.CayenneRuntime}
  *     so they can safely store big chunks of data.
  * </p>
  * <p>
diff --git a/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
index beb9f42687..6cd87ee8fc 100644
--- a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cayenne.project;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
index ff90dd3e33..d6bad14b6b 100644
--- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
+++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.velocity;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.di.Module;
 
diff --git a/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
index c7982cfc3e..9fd4e28a1e 100644
--- a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
+++ b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.velocity;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
+import org.apache.cayenne.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntime.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
rename to cayenne/src/main/java/org/apache/cayenne/CayenneRuntime.java
index ef66833d3b..16a40f236a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntime.java
@@ -16,10 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
-import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.configuration.ObjectContextFactory;
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeBuilder.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
rename to cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeBuilder.java
index 0b2626ed09..c5627d29ca 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
+++ b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeBuilder.java
@@ -16,13 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
 import org.apache.cayenne.configuration.Constants;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.configuration.DataNodeDescriptors;
-import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.CoreModuleExtender;
 import org.apache.cayenne.datasource.CayenneDataSource;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.di.spi.ModuleLoader;
@@ -42,7 +40,7 @@ import java.util.Set;
  * configure custom modules, multiple config locations, or quickly create a
  * global {@link DataSource}.
  *
- * @since 5.0 renamed from ServerRuntimeBuilder and moved to {@code org.apache.cayenne.runtime} package
+ * @since 5.0 renamed from ServerRuntimeBuilder and moved to {@code org.apache.cayenne} package
  */
 public class CayenneRuntimeBuilder {
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeModuleProvider.java
similarity index 88%
rename from cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java
rename to cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeModuleProvider.java
index 96c11fe9a8..aae282609c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/CayenneRuntimeModuleProvider.java
@@ -17,12 +17,12 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
 import org.apache.cayenne.di.spi.ModuleProvider;
 
 /**
- * This interface implementations will be used by {@link CayenneRuntimeBuilder} to auto-load runtime modules.
+ * Tag interface whose implementors are DI modules that want to be auto-loaded when Cayenne starts.
  *
  * @since 5.0
  */
diff --git a/cayenne/src/main/java/org/apache/cayenne/CoreModuleProvider.java b/cayenne/src/main/java/org/apache/cayenne/CoreModuleProvider.java
index f01a6b21e0..44ae0cc213 100644
--- a/cayenne/src/main/java/org/apache/cayenne/CoreModuleProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/CoreModuleProvider.java
@@ -19,7 +19,6 @@
 package org.apache.cayenne;
 
 import org.apache.cayenne.di.Module;
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java b/cayenne/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
index 363f5649e3..8e0e21af3d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/RuntimeProperties.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration;
 import java.util.Map;
 
 /**
- * Represents a properties map for a given {@link org.apache.cayenne.runtime.CayenneRuntime}.
+ * Represents a properties map for a given {@link org.apache.cayenne.CayenneRuntime}.
  *
  * @since 3.1
  */
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
index ad1a33ca0c..4c2f7cbc26 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.configuration.server;
 
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/tx/TransactionDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/tx/TransactionDescriptor.java
index a301692b7a..c32ed535ee 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/TransactionDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/TransactionDescriptor.java
@@ -31,7 +31,7 @@ import java.util.function.Supplier;
  *  <li> custom connection to use in a transaction
  * </ul>
  * @see TransactionManager#performInTransaction(TransactionalOperation, TransactionDescriptor)
- * @see org.apache.cayenne.runtime.CayenneRuntime#performInTransaction(TransactionalOperation, TransactionDescriptor)
+ * @see org.apache.cayenne.CayenneRuntime#performInTransaction(TransactionalOperation, TransactionDescriptor)
  * @since 4.1
  */
 public class TransactionDescriptor {
diff --git a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
similarity index 100%
rename from cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
rename to cayenne/src/main/resources/META-INF/services/org.apache.cayenne.CayenneRuntimeModuleProvider
diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
index fec38464b0..56bb4372b3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
@@ -22,7 +22,6 @@ package org.apache.cayenne;
 import org.apache.cayenne.query.CapsStrategy;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
index da2a96e27d..b0995441d5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
@@ -22,7 +22,6 @@ package org.apache.cayenne;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.ArtistExhibit;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
index efc722b311..e89af21b47 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
@@ -21,7 +21,6 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.access.MockDataNode;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.ArtGroup;
 import org.apache.cayenne.testdo.testmap.Artist;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
index c3dc069d3e..50b6c15143 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
@@ -21,7 +21,6 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
index fc2564259c..da91554950 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
@@ -21,7 +21,6 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.access.ToManyList;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.ArtGroup;
 import org.apache.cayenne.testdo.testmap.Artist;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java
index 2dd705b43d..39061a1cc7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java
@@ -20,7 +20,6 @@
 package org.apache.cayenne;
 
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderIT.java
similarity index 98%
rename from cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
rename to cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderIT.java
index 0202e5325b..5e6dc08474 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderIT.java
@@ -16,10 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
-import org.apache.cayenne.DataRow;
-import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.configuration.DataSourceDescriptor;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderTest.java
similarity index 98%
rename from cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
rename to cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderTest.java
index ced6085508..81fcfaaa95 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeBuilderTest.java
@@ -16,10 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
 import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.di.Key;
 import org.apache.cayenne.di.Module;
 import org.junit.jupiter.api.AfterEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeIT.java b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeIT.java
similarity index 98%
rename from cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeIT.java
rename to cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeIT.java
index 9c5eb4a493..5094ccde7f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeIT.java
@@ -16,9 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
-import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.tx.Transaction;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeLazyStartupTest.java b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeLazyStartupTest.java
similarity index 98%
rename from cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeLazyStartupTest.java
rename to cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeLazyStartupTest.java
index e6659a2c94..afa5c5f36a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeLazyStartupTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeLazyStartupTest.java
@@ -16,10 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeTest.java
similarity index 97%
rename from cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
rename to cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeTest.java
index 4501560590..48f8b12999 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneRuntimeTest.java
@@ -16,10 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.runtime;
+package org.apache.cayenne;
 
-import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.configuration.ObjectContextFactory;
diff --git a/cayenne/src/test/java/org/apache/cayenne/CoreModuleProviderTest.java b/cayenne/src/test/java/org/apache/cayenne/CoreModuleProviderTest.java
index 42f9b9a4b7..1440b0d69c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CoreModuleProviderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CoreModuleProviderTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.cayenne;
 
-import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
 import org.apache.cayenne.unit.ModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
index a559c6a1e8..7690339798 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKDep;
 import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKTest1;
 import org.apache.cayenne.testdo.meaningful_pk.MeaningfulPk;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
index f4167fce0e..84bde8c41c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.query.EntityResultSegment;
 import org.apache.cayenne.query.ColumnSelect;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.reflect.PersistentDescriptor;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.CompoundPainting;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
index a2cd53f408..d07f97c81c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.Cayenne;
 import org.apache.cayenne.FaultFailureException;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.PersistenceState;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
index 76a882075f..fa1cf89482 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.Persistent;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
index 51e97a47d8..a7fca7bb04 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.ArtistExhibit;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
index aeeabf68e5..1c21b75a49 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.DataRow;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.event.DefaultEventManager;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.test.parallel.ParallelTestContainer;
 import org.apache.cayenne.testdo.testmap.Artist;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
index 4726bcc469..6f50850a80 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.log.NoopSQLLogger;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
index fd76e64a52..13f11c7508 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.access;
 
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
index b4838200c6..ab783f5cf9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.query.SQLSelect;
 import org.apache.cayenne.query.SQLTemplate;
 import org.apache.cayenne.query.SortOrder;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Gallery;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
index 7d2b8ec07b..4477f9630e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access;
 
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.parallel.ParallelTestContainer;
 import org.apache.cayenne.testdo.relationships_child_master.Child;
 import org.apache.cayenne.testdo.relationships_child_master.Master;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
index c082c52982..81efad3ef5 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
index 7f37f7f461..b38cfad228 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.ArtGroup;
 import org.apache.cayenne.testdo.testmap.Artist;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
index 68575afd97..5cdf96bf1b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java
@@ -23,7 +23,7 @@ import java.util.Random;
 
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.test.parallel.ParallelTestContainer;
 import org.apache.cayenne.testdo.testmap.Artist;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
index 6636164e4d..2a07575e57 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.exp.property.NumericProperty;
 import org.apache.cayenne.exp.property.PropertyFactory;
 import org.apache.cayenne.graph.GraphDiff;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.numeric_types.BigDecimalEntity;
 import org.apache.cayenne.testdo.numeric_types.BigIntegerEntity;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
index 48f574f05b..524764c0ef 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.access.flush.operation.GraphBasedDbRowOpSorter;
 import org.apache.cayenne.query.ColumnSelect;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.query.PrefetchTreeNode;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.inheritance_vertical.*;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
index c0a2ef6788..8ad6b66265 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceMultipleAttributesIT.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.inheritance_vertical.IvImpl;
 import org.apache.cayenne.testdo.inheritance_vertical.IvOther;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
index a735845c63..efad28b7ad 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.query.DeleteBatchQuery;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
index 78060c75cc..7cd749adbe 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorIT.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.query.InsertBatchQuery;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
index 7cd2ff1807..e64b7a78f3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.query.UpdateBatchQuery;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.locking.SimpleLockingTestEntity;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
index c489ba39d3..b0c27e5f3f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.exp.ExpressionFactory;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.compound.CompoundFkTestEntity;
 import org.apache.cayenne.testdo.compound.CompoundPkTestEntity;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/directive/ResultDirectiveIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/directive/ResultDirectiveIT.java
index 76c3b504be..ba2b8f5588 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/directive/ResultDirectiveIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/sqltemplate/directive/ResultDirectiveIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access.translator.sqltemplate.directive;
 import org.apache.cayenne.access.MockOperationObserver;
 import org.apache.cayenne.query.CapsStrategy;
 import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilterIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilterIT.java
index 54c6139dba..708a3db1b9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilterIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilterIT.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.commitlog.model.*;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_All_FlattenedIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_All_FlattenedIT.java
index cf5a610e42..61fe230355 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_All_FlattenedIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_All_FlattenedIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.commitlog.model.ToManyRelationshipChange;
 import org.apache.cayenne.commitlog.unit.FlattenedRuntimeCase;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_FilteredIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_FilteredIT.java
index 48f25b1ea5..ff81ff582a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_FilteredIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_FilteredIT.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.commitlog.model.ToManyRelationshipChange;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_ListenerInducedChangesIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_ListenerInducedChangesIT.java
index 22b5fbcebe..10bcc19b46 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_ListenerInducedChangesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_ListenerInducedChangesIT.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.commitlog.model.ObjectChangeType;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_OutsideTxIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_OutsideTxIT.java
index f00624804e..960a38d24f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_OutsideTxIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_OutsideTxIT.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.commitlog.db.Auditable2;
 import org.apache.cayenne.commitlog.model.ObjectChange;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.tx.BaseTransaction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_IT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_IT.java
index 5f6c28230a..9a251a2032 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_IT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_IT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.commitlog.model.ObjectChange;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.tx.BaseTransaction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_OutsideTxIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_OutsideTxIT.java
index 27ec9fff26..ecd189f79e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_OutsideTxIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_PreUpdate_OutsideTxIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.commitlog.model.ObjectChange;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.tx.BaseTransaction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_TxIT.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_TxIT.java
index f220899967..cf8bae519a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_TxIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/CommitLogFilter_TxIT.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.commitlog.db.Auditable2;
 import org.apache.cayenne.commitlog.model.ObjectChange;
 import org.apache.cayenne.commitlog.unit.AuditableRuntimeCase;
 import org.apache.cayenne.CoreModule;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.tx.BaseTransaction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
index ba989deba3..9f50701ac6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/AuditableRuntimeCase.java
@@ -20,8 +20,8 @@ package org.apache.cayenne.commitlog.unit;
 
 import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.datasource.CayenneDataSource;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.test.jdbc.DbHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.junit.jupiter.api.AfterEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
index b9f9c98ee0..7792f3b5fe 100644
--- a/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
+++ b/cayenne/src/test/java/org/apache/cayenne/commitlog/unit/FlattenedRuntimeCase.java
@@ -20,8 +20,8 @@ package org.apache.cayenne.commitlog.unit;
 
 import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.datasource.CayenneDataSource;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.test.jdbc.DbHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.junit.jupiter.api.AfterEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
index cf6d5d59c5..95d648f362 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.graph.GraphDiff;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.LifecycleEvent;
 import org.apache.cayenne.query.Query;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.db1.CrossdbM1E1;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactoryIT.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactoryIT.java
index 428e9f1e46..76da999620 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactoryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactoryIT.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.datasource.ManagedPoolingDataSource;
 import org.apache.cayenne.dba.AutoAdapter;
 import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.di.Module;
-import org.apache.cayenne.runtime.CayenneRuntime;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
+import org.apache.cayenne.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntimeBuilder;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.junit.jupiter.api.AfterEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
index 7a99fe2adc..7cc289fca0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.qualified.Qualified1;
 import org.apache.cayenne.unit.dba.DerbyTestDbAdapter;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java
index fa2da4c5ec..9d97433c4b 100644
--- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java
+++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_743Test.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.jira;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
index abb3c0ba17..c8073a6d8e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/DbRelationshipIT.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.map;
 
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
index b5457bb6db..d5e94abee9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.configuration.EmptyProjectNodeVisitor;
 import org.apache.cayenne.exp.ExpressionException;
 import org.apache.cayenne.exp.path.CayennePath;
 import org.apache.cayenne.resource.URLResource;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.inheritance_vertical.Iv2Sub1;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
index 2cdede6a41..4dcaa6f38f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.exp.property.NumericProperty;
 import org.apache.cayenne.exp.property.PropertyFactory;
 import org.apache.cayenne.exp.property.StringProperty;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.ArtistExhibit;
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
index 3a052e0bbe..d40ca32cee 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.query;
 import java.util.List;
 
 import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.compound.CompoundFkTestEntity;
 import org.apache.cayenne.testdo.compound.CompoundPkTestEntity;
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
index e026e9acfc..4bafdc112a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.query;
 
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.inheritance_with_enum.Dependent;
 import org.apache.cayenne.testdo.inheritance_with_enum.Root;
diff --git a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
index cb44176469..988890a247 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.tx;
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.log.NoopSQLLogger;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.CayenneProjects;
 import org.apache.cayenne.unit.CayenneTestsEnv;
diff --git a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
index 855bceda8c..f112b24019 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.apache.cayenne.unit.CayenneProjects;
diff --git a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
index 8584402e1e..e65503af46 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionPropagationRollbackIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.tx;
 
 import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
index 6ca32e80a2..6865b8d014 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java
@@ -34,7 +34,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.DbHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.unit.datasource.DataSourceConfigLoader;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
index 714fb4febf..5b1768d533 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/DbSchemaManager.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.unit.dba.TestDbAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java
index 0b904ba2c2..5f3e1efbea 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/telemetry/TestTelemetry.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.unit.telemetry;
 
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 
 import java.util.Collection;
 
diff --git a/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java b/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
index a35229714d..5e3c90b169 100644
--- a/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
diff --git a/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/starting.adoc b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/starting.adoc
index d8c3fd7f6d..b338c6bdd6 100644
--- a/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/starting.adoc
+++ b/docs/cayenne-guide/src/docs/asciidoc/_cayenne-guide/starting.adoc
@@ -16,7 +16,7 @@
 
 === Starting and Stopping CayenneRuntime
 
-In runtime Cayenne is accessed via `org.apache.cayenne.runtime.CayenneRuntime`. CayenneRuntime is created by calling a convenient builder:
+In runtime Cayenne is accessed via `org.apache.cayenne.CayenneRuntime`. CayenneRuntime is created by calling a convenient builder:
 
 [source,java,indent=0]
 ----
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/BaseTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/BaseTest.java
index e4b85b0cb8..153ac65f93 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/BaseTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/BaseTest.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.docs.persistent.Artist;
 import org.apache.cayenne.docs.persistent.Gallery;
 import org.apache.cayenne.docs.persistent.Painting;
 import org.apache.cayenne.query.SQLExec;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CacheInvalidationTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CacheInvalidationTest.java
index 3a0628c29c..aa3b62864c 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CacheInvalidationTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CacheInvalidationTest.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.docs;
 
 import org.apache.cayenne.cache.invalidation.CacheInvalidationModule;
 import org.apache.cayenne.docs.cacheinvalidation.CustomInvalidationHandler;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CommitLogTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CommitLogTest.java
index 9ca0c0b782..9f2f6cfa89 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CommitLogTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CommitLogTest.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.docs.commitlog.AuditListener;
 import org.apache.cayenne.docs.commitlog.MyEntityFactory;
 import org.apache.cayenne.docs.persistent.Artist;
 import org.apache.cayenne.docs.persistent.Painting;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CryptoExamples.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CryptoExamples.java
index 7fecc9023d..239ad6b509 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CryptoExamples.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CryptoExamples.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.crypto.CryptoModule;
 import org.apache.cayenne.docs.crypto.MyClass;
 import org.apache.cayenne.docs.crypto.MyClassBytesConverter;
 import org.apache.cayenne.docs.crypto.MyColumnMapper;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 
 /**
  * Examples that are only compiled, but not run, as there is no keystore or encrypted columns in the docs test project.
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CustomizeTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CustomizeTest.java
index f76c15fa9e..22988a52c5 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CustomizeTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/CustomizeTest.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.docs.di.Service1;
 import org.apache.cayenne.docs.di.Service1Provider;
 import org.apache.cayenne.docs.di.Service2;
 import org.apache.cayenne.docs.di.Service2Impl;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/JCacheExamples.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/JCacheExamples.java
index 533b4192b2..4ee6247e7b 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/JCacheExamples.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/JCacheExamples.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.docs;
 
 import org.apache.cayenne.jcache.JCacheModule;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 
 import javax.cache.CacheManager;
 
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/LifecycleTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/LifecycleTest.java
index 41b2ccef57..05835349be 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/LifecycleTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/LifecycleTest.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.CoreModule;
 import org.apache.cayenne.docs.lifecycle.CommittedObjectCounter;
 import org.apache.cayenne.docs.lifecycle.Listener1;
 import org.apache.cayenne.docs.lifecycle.Listener2;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/StartingTest.java b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/StartingTest.java
index 6586bac0a6..be1a43e4f2 100644
--- a/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/StartingTest.java
+++ b/docs/cayenne-guide/src/test/java/org/apache/cayenne/docs/StartingTest.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.datasource.CayenneDataSource;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.docs.persistent.Artist;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
diff --git a/docs/getting-started-guide/src/main/java/org/example/cayenne/Main.java b/docs/getting-started-guide/src/main/java/org/example/cayenne/Main.java
index 40e2b84c85..c44c2a229a 100644
--- a/docs/getting-started-guide/src/main/java/org/example/cayenne/Main.java
+++ b/docs/getting-started-guide/src/main/java/org/example/cayenne/Main.java
@@ -26,7 +26,7 @@ package org.example.cayenne;
 // end::main-empty[]
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.datasource.CayenneDataSource;
-import org.apache.cayenne.runtime.CayenneRuntime;
+import org.apache.cayenne.CayenneRuntime;
 
 import javax.sql.DataSource;
 // end::main-runtime[]