eclipse-edc · ndr-brt · Aug 22, 2022 · Aug 17, 2022 · Aug 19, 2022 · Aug 19, 2022
@@ -371,7 +371,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           command: |
-            ./gradlew -p core/micrometer test -DincludeTags="OpenTelemetryIntegrationTest"
+            ./gradlew -p extensions/micrometer test -DincludeTags="OpenTelemetryIntegrationTest"
             ./gradlew -p system-tests/tests test -DincludeTags="OpenTelemetryIntegrationTest"
 
   Check-Cloud-Environments:

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
diff --git a/core/base/README.md → core/common/base/README.md b/core/base/README.md → core/common/base/README.md
diff --git a/core/base/build.gradle.kts → core/common/base/build.gradle.kts b/core/base/build.gradle.kts → core/common/base/build.gradle.kts
@@ -28,8 +28,7 @@ dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":common:util"))
-    implementation(project(":core:defaults"))
-    implementation(project(":core:policy:policy-engine"))
+    implementation(project(":core:common:policy-engine"))
     implementation(project(":extensions:dataloading"))
 
     api("com.squareup.okhttp3:okhttp:${okHttpVersion}")

diff --git a/...connector/core/CoreServicesExtension.java → ...connector/core/CoreServicesExtension.java b/...connector/core/CoreServicesExtension.java → ...connector/core/CoreServicesExtension.java
diff --git a/...core/base/CommandHandlerRegistryImpl.java → ...core/base/CommandHandlerRegistryImpl.java b/...core/base/CommandHandlerRegistryImpl.java → ...core/base/CommandHandlerRegistryImpl.java
diff --git a/...nector/core/base/OkHttpClientFactory.java → ...nector/core/base/OkHttpClientFactory.java b/...nector/core/base/OkHttpClientFactory.java → ...nector/core/base/OkHttpClientFactory.java
diff --git a/.../RemoteMessageDispatcherRegistryImpl.java → .../RemoteMessageDispatcherRegistryImpl.java b/.../RemoteMessageDispatcherRegistryImpl.java → .../RemoteMessageDispatcherRegistryImpl.java
diff --git a/...se/agent/ParticipantAgentServiceImpl.java → ...se/agent/ParticipantAgentServiceImpl.java b/...se/agent/ParticipantAgentServiceImpl.java → ...se/agent/ParticipantAgentServiceImpl.java
diff --git a/...r/core/base/policy/PolicyContextImpl.java → ...r/core/base/policy/PolicyContextImpl.java b/...r/core/base/policy/PolicyContextImpl.java → ...r/core/base/policy/PolicyContextImpl.java
diff --git a/...or/core/base/policy/PolicyEngineImpl.java → ...or/core/base/policy/PolicyEngineImpl.java b/...or/core/base/policy/PolicyEngineImpl.java → ...or/core/base/policy/PolicyEngineImpl.java
diff --git a/.../base/policy/RuleBindingRegistryImpl.java → .../base/policy/RuleBindingRegistryImpl.java b/.../base/policy/RuleBindingRegistryImpl.java → .../base/policy/RuleBindingRegistryImpl.java
diff --git a/...nnector/core/base/policy/ScopeFilter.java → ...nnector/core/base/policy/ScopeFilter.java b/...nnector/core/base/policy/ScopeFilter.java → ...nnector/core/base/policy/ScopeFilter.java
diff --git a/...re/defaults/DefaultServicesExtension.java → ...re/defaults/DefaultServicesExtension.java b/...re/defaults/DefaultServicesExtension.java → ...re/defaults/DefaultServicesExtension.java
@@ -17,34 +17,19 @@
 import dev.failsafe.RetryPolicy;
 import okhttp3.EventListener;
 import okhttp3.OkHttpClient;
-import org.eclipse.dataspaceconnector.common.concurrency.LockManager;
 import org.eclipse.dataspaceconnector.core.base.OkHttpClientFactory;
-import org.eclipse.dataspaceconnector.core.defaults.assetindex.InMemoryAssetIndex;
-import org.eclipse.dataspaceconnector.core.defaults.contractdefinition.InMemoryContractDefinitionStore;
-import org.eclipse.dataspaceconnector.core.defaults.negotiationstore.InMemoryContractNegotiationStore;
-import org.eclipse.dataspaceconnector.core.defaults.policystore.InMemoryPolicyDefinitionStore;
-import org.eclipse.dataspaceconnector.core.defaults.transferprocessstore.InMemoryTransferProcessStore;
-import org.eclipse.dataspaceconnector.dataloading.AssetLoader;
-import org.eclipse.dataspaceconnector.dataloading.ContractDefinitionLoader;
 import org.eclipse.dataspaceconnector.spi.EdcSetting;
-import org.eclipse.dataspaceconnector.spi.asset.AssetIndex;
-import org.eclipse.dataspaceconnector.spi.asset.DataAddressResolver;
-import org.eclipse.dataspaceconnector.spi.contract.negotiation.store.ContractNegotiationStore;
-import org.eclipse.dataspaceconnector.spi.contract.offer.store.ContractDefinitionStore;
-import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
 import org.eclipse.dataspaceconnector.spi.system.Inject;
 import org.eclipse.dataspaceconnector.spi.system.Provider;
 import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
 import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
 import org.eclipse.dataspaceconnector.spi.transaction.NoopTransactionContext;
 import org.eclipse.dataspaceconnector.spi.transaction.TransactionContext;
-import org.eclipse.dataspaceconnector.spi.transfer.store.TransferProcessStore;
 
 import java.time.temporal.ChronoUnit;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- * Provides (in-mem &amp; no-op) defaults for various stores, registries etc.
+ * Provides defaults for various services.
  * Provider methods are only invoked if no other implementation was found on the classpath.
  */
 public class DefaultServicesExtension implements ServiceExtension {
@@ -55,8 +40,6 @@ public class DefaultServicesExtension implements ServiceExtension {
     @EdcSetting(value = "Maximum number of milliseconds for exponential backoff. ")
     public static final String BACKOFF_MAX_MILLIS = "edc.core.retry.backoff.max";
 
-    private InMemoryAssetIndex assetIndex;
-    private InMemoryContractDefinitionStore contractDefinitionStore;
     /**
      * An optional OkHttp {@link EventListener} that can be used to instrument OkHttp client for collecting metrics.
      * Used by the optional {@code micrometer} module.
@@ -79,46 +62,6 @@ public RetryPolicy<?> retryPolicy(ServiceExtensionContext context) {
                 .build();
     }
 
-    @Provider(isDefault = true)
-    public AssetIndex defaultAssetIndex() {
-        return getAssetIndex();
-    }
-
-    @Provider(isDefault = true)
-    public DataAddressResolver defaultDataAddressResolver() {
-        return getAssetIndex();
-    }
-
-    @Provider(isDefault = true)
-    public AssetLoader defaultAssetLoader() {
-        return getAssetIndex();
-    }
-
-    @Provider(isDefault = true)
-    public ContractDefinitionStore defaultContractDefinitionStore() {
-        return getContractDefinitionStore();
-    }
-
-    @Provider(isDefault = true)
-    public ContractDefinitionLoader defaultContractDefinitionLoader() {
-        return getContractDefinitionStore()::save;
-    }
-
-    @Provider(isDefault = true)
-    public ContractNegotiationStore defaultContractNegotiationStore() {
-        return new InMemoryContractNegotiationStore();
-    }
-
-    @Provider(isDefault = true)
-    public TransferProcessStore defaultTransferProcessStore() {
-        return new InMemoryTransferProcessStore();
-    }
-
-    @Provider(isDefault = true)
-    public PolicyDefinitionStore defaultPolicyStore() {
-        return new InMemoryPolicyDefinitionStore(new LockManager(new ReentrantReadWriteLock(true)));
-    }
-
     @Provider(isDefault = true)
     public TransactionContext defaultTransactionContext(ServiceExtensionContext context) {
         context.getMonitor().warning("No TransactionContext registered, a no-op implementation will be used, not suitable for production environments");
@@ -130,18 +73,4 @@ public TransactionContext defaultTransactionContext(ServiceExtensionContext cont
     public OkHttpClient okHttpClient(ServiceExtensionContext context) {
         return OkHttpClientFactory.create(context, okHttpEventListener);
     }
-
-    private ContractDefinitionStore getContractDefinitionStore() {
-        if (contractDefinitionStore == null) {
-            contractDefinitionStore = new InMemoryContractDefinitionStore();
-        }
-        return contractDefinitionStore;
-    }
-
-    private InMemoryAssetIndex getAssetIndex() {
-        if (assetIndex == null) {
-            assetIndex = new InMemoryAssetIndex();
-        }
-        return assetIndex;
-    }
 }
diff --git a/.../event/EventExecutorServiceContainer.java → .../event/EventExecutorServiceContainer.java b/.../event/EventExecutorServiceContainer.java → .../event/EventExecutorServiceContainer.java
diff --git a/...connector/core/event/EventRouterImpl.java → ...connector/core/event/EventRouterImpl.java b/...connector/core/event/EventRouterImpl.java → ...connector/core/event/EventRouterImpl.java
diff --git a/...alth/HealthCheckServiceConfiguration.java → ...alth/HealthCheckServiceConfiguration.java b/...alth/HealthCheckServiceConfiguration.java → ...alth/HealthCheckServiceConfiguration.java
diff --git a/...r/core/health/HealthCheckServiceImpl.java → ...r/core/health/HealthCheckServiceImpl.java b/...r/core/health/HealthCheckServiceImpl.java → ...r/core/health/HealthCheckServiceImpl.java
diff --git a/...urity/DefaultPrivateKeyParseFunction.java → ...urity/DefaultPrivateKeyParseFunction.java b/...urity/DefaultPrivateKeyParseFunction.java → ...urity/DefaultPrivateKeyParseFunction.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...CoreServicesExtensionIntegrationTest.java → ...CoreServicesExtensionIntegrationTest.java b/...CoreServicesExtensionIntegrationTest.java → ...CoreServicesExtensionIntegrationTest.java
diff --git a/...ector/core/CoreServicesExtensionTest.java → ...ector/core/CoreServicesExtensionTest.java b/...ector/core/CoreServicesExtensionTest.java → ...ector/core/CoreServicesExtensionTest.java
diff --git a/...eManagerDependencyInjectionExtension.java → ...eManagerDependencyInjectionExtension.java b/...eManagerDependencyInjectionExtension.java → ...eManagerDependencyInjectionExtension.java
diff --git a/...or/core/base/OkHttpClientFactoryTest.java → ...or/core/base/OkHttpClientFactoryTest.java b/...or/core/base/OkHttpClientFactoryTest.java → ...or/core/base/OkHttpClientFactoryTest.java
diff --git a/...gent/ParticipantAgentServiceImplTest.java → ...gent/ParticipantAgentServiceImplTest.java b/...gent/ParticipantAgentServiceImplTest.java → ...gent/ParticipantAgentServiceImplTest.java
diff --git a/...policy/PolicyEngineImplScenariosTest.java → ...policy/PolicyEngineImplScenariosTest.java b/...policy/PolicyEngineImplScenariosTest.java → ...policy/PolicyEngineImplScenariosTest.java
diff --git a/...ore/base/policy/PolicyEngineImplTest.java → ...ore/base/policy/PolicyEngineImplTest.java b/...ore/base/policy/PolicyEngineImplTest.java → ...ore/base/policy/PolicyEngineImplTest.java
diff --git a/...e/policy/RuleBindingRegistryImplTest.java → ...e/policy/RuleBindingRegistryImplTest.java b/...e/policy/RuleBindingRegistryImplTest.java → ...e/policy/RuleBindingRegistryImplTest.java
diff --git a/...tor/core/base/policy/ScopeFilterTest.java → ...tor/core/base/policy/ScopeFilterTest.java b/...tor/core/base/policy/ScopeFilterTest.java → ...tor/core/base/policy/ScopeFilterTest.java
diff --git a/...ector/core/event/EventRouterImplTest.java → ...ector/core/event/EventRouterImplTest.java b/...ector/core/event/EventRouterImplTest.java → ...ector/core/event/EventRouterImplTest.java
diff --git a/...re/health/HealthCheckServiceImplTest.java → ...re/health/HealthCheckServiceImplTest.java b/...re/health/HealthCheckServiceImplTest.java → ...re/health/HealthCheckServiceImplTest.java
diff --git a/...y/DefaultPrivateKeyParseFunctionTest.java → ...y/DefaultPrivateKeyParseFunctionTest.java b/...y/DefaultPrivateKeyParseFunctionTest.java → ...y/DefaultPrivateKeyParseFunctionTest.java
diff --git a/...base/src/test/resources/ec-privatekey.pem → ...base/src/test/resources/ec-privatekey.pem b/...base/src/test/resources/ec-privatekey.pem → ...base/src/test/resources/ec-privatekey.pem
diff --git a/...ase/src/test/resources/rsa-privatekey.pem → ...ase/src/test/resources/rsa-privatekey.pem b/...ase/src/test/resources/rsa-privatekey.pem → ...ase/src/test/resources/rsa-privatekey.pem
@@ -18,7 +18,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:policy:policy-evaluator"))
+    api(project(":core:common:policy-evaluator"))
 }
 
 publishing {

diff --git a/core/contract/README.md → core/control-plane/contract/README.md b/core/contract/README.md → core/control-plane/contract/README.md
diff --git a/core/contract/build.gradle.kts → core/control-plane/contract/build.gradle.kts b/core/contract/build.gradle.kts → core/control-plane/contract/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(project(":common:state-machine-lib"))
     implementation("io.opentelemetry:opentelemetry-extension-annotations:${openTelemetryVersion}")
 
-    testImplementation(project(":core:defaults"))
+    testImplementation(project(":core:control-plane:control-plane-core"))
     testImplementation(project(":extensions:junit"))
     testImplementation(testFixtures(project(":common:util")))
     testImplementation("org.awaitility:awaitility:${awaitility}")

diff --git a/.../ContractNegotiationCommandExtension.java → .../ContractNegotiationCommandExtension.java b/.../ContractNegotiationCommandExtension.java → .../ContractNegotiationCommandExtension.java
diff --git a/...or/contract/ContractServiceExtension.java → ...or/contract/ContractServiceExtension.java b/...or/contract/ContractServiceExtension.java → ...or/contract/ContractServiceExtension.java
diff --git a/...ner/ContractNegotiationEventListener.java → ...ner/ContractNegotiationEventListener.java b/...ner/ContractNegotiationEventListener.java → ...ner/ContractNegotiationEventListener.java
diff --git a/...n/AbstractContractNegotiationManager.java → ...n/AbstractContractNegotiationManager.java b/...n/AbstractContractNegotiationManager.java → ...n/AbstractContractNegotiationManager.java
diff --git a/...nsumerContractNegotiationManagerImpl.java → ...nsumerContractNegotiationManagerImpl.java b/...nsumerContractNegotiationManagerImpl.java → ...nsumerContractNegotiationManagerImpl.java
@@ -20,8 +20,8 @@
 import io.opentelemetry.extension.annotations.WithSpan;
 import org.eclipse.dataspaceconnector.common.statemachine.StateMachineManager;
 import org.eclipse.dataspaceconnector.common.statemachine.StateProcessorImpl;
-import org.eclipse.dataspaceconnector.contract.common.ContractId;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
+import org.eclipse.dataspaceconnector.spi.contract.ContractId;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.ConsumerContractNegotiationManager;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.response.StatusResult;
@@ -44,8 +44,8 @@
 import java.util.function.Function;
 
 import static java.lang.String.format;
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.DEFINITION_PART;
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.parseContractId;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.DEFINITION_PART;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.parseContractId;
 import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation.Type.CONSUMER;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONFIRMED;

diff --git a/...oviderContractNegotiationManagerImpl.java → ...oviderContractNegotiationManagerImpl.java b/...oviderContractNegotiationManagerImpl.java → ...oviderContractNegotiationManagerImpl.java
@@ -20,8 +20,8 @@
 import io.opentelemetry.extension.annotations.WithSpan;
 import org.eclipse.dataspaceconnector.common.statemachine.StateMachineManager;
 import org.eclipse.dataspaceconnector.common.statemachine.StateProcessorImpl;
-import org.eclipse.dataspaceconnector.contract.common.ContractId;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
+import org.eclipse.dataspaceconnector.spi.contract.ContractId;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.ProviderContractNegotiationManager;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.response.StatusResult;
@@ -41,8 +41,8 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.DEFINITION_PART;
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.parseContractId;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.DEFINITION_PART;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.parseContractId;
 import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation.Type.PROVIDER;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONFIRMING;

diff --git a/...lers/CancelNegotiationCommandHandler.java → ...lers/CancelNegotiationCommandHandler.java b/...lers/CancelNegotiationCommandHandler.java → ...lers/CancelNegotiationCommandHandler.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.dataspaceconnector.contract.negotiation.command.handlers;
 
-import org.eclipse.dataspaceconnector.contract.negotiation.command.commands.CancelNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.store.ContractNegotiationStore;
+import org.eclipse.dataspaceconnector.spi.types.domain.contract.command.CancelNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 
 /**

diff --git a/...gleContractNegotiationCommandHandler.java → ...gleContractNegotiationCommandHandler.java b/...gleContractNegotiationCommandHandler.java → ...gleContractNegotiationCommandHandler.java
@@ -14,10 +14,10 @@
 
 package org.eclipse.dataspaceconnector.contract.negotiation.command.handlers;
 
-import org.eclipse.dataspaceconnector.contract.negotiation.command.commands.SingleContractNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.EdcException;
 import org.eclipse.dataspaceconnector.spi.command.CommandHandler;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.store.ContractNegotiationStore;
+import org.eclipse.dataspaceconnector.spi.types.domain.contract.command.SingleContractNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 
 import static java.lang.String.format;

diff --git a/...ve/ContractNegotiationObservableImpl.java → ...ve/ContractNegotiationObservableImpl.java b/...ve/ContractNegotiationObservableImpl.java → ...ve/ContractNegotiationObservableImpl.java
diff --git a/.../offer/ContractDefinitionServiceImpl.java → .../offer/ContractDefinitionServiceImpl.java b/.../offer/ContractDefinitionServiceImpl.java → .../offer/ContractDefinitionServiceImpl.java
diff --git a/...tract/offer/ContractOfferServiceImpl.java → ...tract/offer/ContractOfferServiceImpl.java b/...tract/offer/ContractOfferServiceImpl.java → ...tract/offer/ContractOfferServiceImpl.java
@@ -17,10 +17,10 @@
 
 package org.eclipse.dataspaceconnector.contract.offer;
 
-import org.eclipse.dataspaceconnector.contract.common.ContractId;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.agent.ParticipantAgentService;
 import org.eclipse.dataspaceconnector.spi.asset.AssetIndex;
+import org.eclipse.dataspaceconnector.spi.contract.ContractId;
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractDefinitionService;
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractOfferQuery;
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractOfferService;

diff --git a/...or/contract/policy/PolicyArchiveImpl.java → ...or/contract/policy/PolicyArchiveImpl.java b/...or/contract/policy/PolicyArchiveImpl.java → ...or/contract/policy/PolicyArchiveImpl.java
diff --git a/...ector/contract/policy/PolicyEquality.java → ...ector/contract/policy/PolicyEquality.java b/...ector/contract/policy/PolicyEquality.java → ...ector/contract/policy/PolicyEquality.java
diff --git a/...dation/ContractValidationServiceImpl.java → ...dation/ContractValidationServiceImpl.java b/...dation/ContractValidationServiceImpl.java → ...dation/ContractValidationServiceImpl.java
@@ -32,8 +32,8 @@
 import java.time.Clock;
 
 import static java.lang.String.format;
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.DEFINITION_PART;
-import static org.eclipse.dataspaceconnector.contract.common.ContractId.parseContractId;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.DEFINITION_PART;
+import static org.eclipse.dataspaceconnector.spi.contract.ContractId.parseContractId;
 
 /**
  * Implementation of the {@link ContractValidationService}.

diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...ontract/ContractServiceExtensionTest.java → ...ontract/ContractServiceExtensionTest.java b/...ontract/ContractServiceExtensionTest.java → ...ontract/ContractServiceExtensionTest.java
diff --git a/...ctContractNegotiationIntegrationTest.java → ...ctContractNegotiationIntegrationTest.java b/...ctContractNegotiationIntegrationTest.java → ...ctContractNegotiationIntegrationTest.java
@@ -15,15 +15,15 @@
 package org.eclipse.dataspaceconnector.contract.negotiation;
 
 import org.eclipse.dataspaceconnector.common.statemachine.retry.SendRetryManager;
-import org.eclipse.dataspaceconnector.contract.common.ContractId;
 import org.eclipse.dataspaceconnector.contract.observe.ContractNegotiationObservableImpl;
-import org.eclipse.dataspaceconnector.core.defaults.negotiationstore.InMemoryContractNegotiationStore;
+import org.eclipse.dataspaceconnector.core.controlplane.defaults.negotiationstore.InMemoryContractNegotiationStore;
 import org.eclipse.dataspaceconnector.policy.model.Action;
 import org.eclipse.dataspaceconnector.policy.model.Duty;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.policy.model.PolicyType;
 import org.eclipse.dataspaceconnector.spi.command.CommandQueue;
 import org.eclipse.dataspaceconnector.spi.command.CommandRunner;
+import org.eclipse.dataspaceconnector.spi.contract.ContractId;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.observe.ContractNegotiationObservable;
 import org.eclipse.dataspaceconnector.spi.contract.validation.ContractValidationService;
 import org.eclipse.dataspaceconnector.spi.entity.StatefulEntity;

diff --git a/...erContractNegotiationManagerImplTest.java → ...erContractNegotiationManagerImplTest.java b/...erContractNegotiationManagerImplTest.java → ...erContractNegotiationManagerImplTest.java
diff --git a/...n/ContractNegotiationIntegrationTest.java → ...n/ContractNegotiationIntegrationTest.java b/...n/ContractNegotiationIntegrationTest.java → ...n/ContractNegotiationIntegrationTest.java
diff --git a/...erContractNegotiationManagerImplTest.java → ...erContractNegotiationManagerImplTest.java b/...erContractNegotiationManagerImplTest.java → ...erContractNegotiationManagerImplTest.java
@@ -16,12 +16,12 @@
 package org.eclipse.dataspaceconnector.contract.negotiation;
 
 import org.eclipse.dataspaceconnector.common.statemachine.retry.SendRetryManager;
-import org.eclipse.dataspaceconnector.contract.common.ContractId;
 import org.eclipse.dataspaceconnector.contract.observe.ContractNegotiationObservableImpl;
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.EdcException;
 import org.eclipse.dataspaceconnector.spi.command.CommandQueue;
 import org.eclipse.dataspaceconnector.spi.command.CommandRunner;
+import org.eclipse.dataspaceconnector.spi.contract.ContractId;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.observe.ContractNegotiationListener;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.store.ContractNegotiationStore;
 import org.eclipse.dataspaceconnector.spi.contract.validation.ContractValidationService;

diff --git a/...gotiationCommandQueueIntegrationTest.java → ...gotiationCommandQueueIntegrationTest.java b/...gotiationCommandQueueIntegrationTest.java → ...gotiationCommandQueueIntegrationTest.java
@@ -17,7 +17,6 @@
 import org.eclipse.dataspaceconnector.common.statemachine.retry.SendRetryManager;
 import org.eclipse.dataspaceconnector.contract.negotiation.ConsumerContractNegotiationManagerImpl;
 import org.eclipse.dataspaceconnector.contract.negotiation.ProviderContractNegotiationManagerImpl;
-import org.eclipse.dataspaceconnector.contract.negotiation.command.commands.SingleContractNegotiationCommand;
 import org.eclipse.dataspaceconnector.contract.negotiation.command.handlers.SingleContractNegotiationCommandHandler;
 import org.eclipse.dataspaceconnector.spi.command.BoundedCommandQueue;
 import org.eclipse.dataspaceconnector.spi.command.CommandHandlerRegistry;
@@ -30,6 +29,7 @@
 import org.eclipse.dataspaceconnector.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.policy.store.PolicyDefinitionStore;
+import org.eclipse.dataspaceconnector.spi.types.domain.contract.command.SingleContractNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.command.ContractNegotiationCommand;

diff --git a/.../CancelNegotiationCommandHandlerTest.java → .../CancelNegotiationCommandHandlerTest.java b/.../CancelNegotiationCommandHandlerTest.java → .../CancelNegotiationCommandHandlerTest.java
@@ -14,9 +14,9 @@
 
 package org.eclipse.dataspaceconnector.contract.negotiation.command.handlers;
 
-import org.eclipse.dataspaceconnector.contract.negotiation.command.commands.CancelNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.EdcException;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.store.ContractNegotiationStore;
+import org.eclipse.dataspaceconnector.spi.types.domain.contract.command.CancelNegotiationCommand;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...er/ContractDefinitionServiceImplTest.java → ...er/ContractDefinitionServiceImplTest.java b/...er/ContractDefinitionServiceImplTest.java → ...er/ContractDefinitionServiceImplTest.java
diff --git a/...t/offer/ContractOfferServiceImplTest.java → ...t/offer/ContractOfferServiceImplTest.java b/...t/offer/ContractOfferServiceImplTest.java → ...t/offer/ContractOfferServiceImplTest.java
diff --git a/...ontract/policy/PolicyArchiveImplTest.java → ...ontract/policy/PolicyArchiveImplTest.java b/...ontract/policy/PolicyArchiveImplTest.java → ...ontract/policy/PolicyArchiveImplTest.java
diff --git a/...r/contract/policy/PolicyEqualityTest.java → ...r/contract/policy/PolicyEqualityTest.java b/...r/contract/policy/PolicyEqualityTest.java → ...r/contract/policy/PolicyEqualityTest.java
diff --git a/...on/ContractValidationServiceImplTest.java → ...on/ContractValidationServiceImplTest.java b/...on/ContractValidationServiceImplTest.java → ...on/ContractValidationServiceImplTest.java
diff --git a/core/control-plane/control-plane-core/build.gradle.kts b/core/control-plane/control-plane-core/build.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+plugins {
+    `java-library`
+}
+
+
+dependencies {
+    api(project(":core:common:base"))
+    api(project(":core:common:boot"))
+    api(project(":core:common:policy-engine"))
+    api(project(":core:control-plane:contract"))
+    api(project(":core:control-plane:transfer"))
+    implementation(project(":common:util"))
+    implementation(project(":extensions:dataloading"))
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("control-plane-core") {
+            artifactId = "control-plane-core"
+            from(components["java"])
+        }
+    }
+}