Moved common classes under the api package under api

  - moved common classes under the api package
  - moved Spec files

Issue-ID: CPS-2512
Change-Id: I88046280ce359ce8cc488ad37d4e6f85406b0dbf
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>

80 files changed, 178 insertions, 173 deletions

diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsAnchorService.java b/cps-service/src/main/java/org/onap/cps/api/CpsAnchorService.java
index fcb969ba30..8c8b88a46d 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsAnchorService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsAnchorService.java
@@ -21,8 +21,8 @@
 package org.onap.cps.api;
 
 import java.util.Collection;
-import org.onap.cps.spi.exceptions.CpsException;
-import org.onap.cps.spi.model.Anchor;
+import org.onap.cps.api.exceptions.CpsException;
+import org.onap.cps.api.model.Anchor;
 
 public interface CpsAnchorService {
 
diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java b/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java
index 29c8ad0168..345bc8825b 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java
@@ -28,9 +28,9 @@ import java.time.OffsetDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import org.onap.cps.spi.FetchDescendantsOption;
-import org.onap.cps.spi.model.DataNode;
-import org.onap.cps.spi.model.DeltaReport;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.model.DeltaReport;
+import org.onap.cps.api.parameters.FetchDescendantsOption;
 import org.onap.cps.utils.ContentType;
 
 /*
diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsDataspaceService.java b/cps-service/src/main/java/org/onap/cps/api/CpsDataspaceService.java
index 7b94604261..32d57d44a6 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsDataspaceService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsDataspaceService.java
@@ -24,8 +24,8 @@
 package org.onap.cps.api;
 
 import java.util.Collection;
-import org.onap.cps.spi.exceptions.AlreadyDefinedException;
-import org.onap.cps.spi.model.Dataspace;
+import org.onap.cps.api.exceptions.AlreadyDefinedException;
+import org.onap.cps.api.model.Dataspace;
 
 /**
  * CPS Admin Service.
diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsDeltaService.java b/cps-service/src/main/java/org/onap/cps/api/CpsDeltaService.java
index d806c208aa..67c4da63ac 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsDeltaService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsDeltaService.java
@@ -22,8 +22,8 @@ package org.onap.cps.api;
 
 import java.util.Collection;
 import java.util.List;
-import org.onap.cps.spi.model.DataNode;
-import org.onap.cps.spi.model.DeltaReport;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.model.DeltaReport;
 
 public interface CpsDeltaService {
 
diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java
index 304ed288f5..e71b44c40f 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java
@@ -24,11 +24,11 @@ package org.onap.cps.api;
 
 import java.util.Collection;
 import java.util.Map;
-import org.onap.cps.spi.CascadeDeleteAllowed;
-import org.onap.cps.spi.exceptions.DataInUseException;
-import org.onap.cps.spi.model.ModuleDefinition;
-import org.onap.cps.spi.model.ModuleReference;
-import org.onap.cps.spi.model.SchemaSet;
+import org.onap.cps.api.exceptions.DataInUseException;
+import org.onap.cps.api.model.ModuleDefinition;
+import org.onap.cps.api.model.ModuleReference;
+import org.onap.cps.api.model.SchemaSet;
+import org.onap.cps.api.parameters.CascadeDeleteAllowed;
 
 /**
  * Responsible for managing module sets.
diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java b/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java
index 34dcbb9e32..d783b9ed0e 100644
--- a/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java
@@ -23,9 +23,9 @@ package org.onap.cps.api;
 
 import java.util.Collection;
 import java.util.Set;
-import org.onap.cps.spi.FetchDescendantsOption;
-import org.onap.cps.spi.PaginationOption;
-import org.onap.cps.spi.model.DataNode;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.parameters.FetchDescendantsOption;
+import org.onap.cps.api.parameters.PaginationOption;
 
 /*
  * Query interface for handling cps queries.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/AlreadyDefinedException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/AlreadyDefinedException.java
index 863bb0f800..0b2204221d 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/AlreadyDefinedException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/AlreadyDefinedException.java
@@ -19,7 +19,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/AnchorNotFoundException.java
index 1ec0ac1285..27ba296bb3 100755
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/AnchorNotFoundException.java
@@ -1,39 +1,39 @@
-/*

- * ============LICENSE_START=======================================================

- *  Copyright (C) 2021 Nordix Foundation.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- *

- * SPDX-License-Identifier: Apache-2.0

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.cps.spi.exceptions;

-

-@SuppressWarnings("squid:S110") // Team agreed to accept 6 levels of inheritance for CPS Exceptions

-public class AnchorNotFoundException extends CpsAdminException {

-

-    private static final long serialVersionUID = -1821064664642194882L;

-

-    /**

-     * Constructor.

-     *

-     * @param anchorName the name of the anchor

-     * @param dataspaceName the dataspace name

-     */

-    public AnchorNotFoundException(final String anchorName, final String dataspaceName) {

-        super("Anchor not found",

-            String.format("Anchor with name %s does not exist in dataspace %s.", anchorName,

-                dataspaceName));

-    }

-}

+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.api.exceptions;
+
+@SuppressWarnings("squid:S110") // Team agreed to accept 6 levels of inheritance for CPS Exceptions
+public class AnchorNotFoundException extends CpsAdminException {
+
+    private static final long serialVersionUID = -1821064664642194882L;
+
+    /**
+     * Constructor.
+     *
+     * @param anchorName the name of the anchor
+     * @param dataspaceName the dataspace name
+     */
+    public AnchorNotFoundException(final String anchorName, final String dataspaceName) {
+        super("Anchor not found",
+            String.format("Anchor with name %s does not exist in dataspace %s.", anchorName,
+                dataspaceName));
+    }
+}
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ConcurrencyException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/ConcurrencyException.java
index b5eae93b32..38effab8ee 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ConcurrencyException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/ConcurrencyException.java
@@ -16,7 +16,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 public class ConcurrencyException extends CpsException {
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsAdminException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsAdminException.java
index 6d6a6c31fa..de5181572a 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsAdminException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsAdminException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * CPS Admin exception.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsException.java
index 96a0678062..e2b2b7b286 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 import lombok.Getter;
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsPathException.java
index ddf1e68f7b..00664de373 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/CpsPathException.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 public class CpsPathException extends CpsException {
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataInUseException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataInUseException.java
index fb023913d0..6127608b90 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataInUseException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataInUseException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Runtime exception. Thrown when data record rejected to be deleted because it's being referenced by other data.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataNodeNotFoundException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataNodeNotFoundException.java
index db10c88b92..521b786095 100755
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataNodeNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataNodeNotFoundException.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * DataNode Not Found Exception. Indicates the requested data being absent.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataNodeNotFoundExceptionBatch.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataNodeNotFoundExceptionBatch.java
index f38c41b407..e4f5e580be 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataNodeNotFoundExceptionBatch.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataNodeNotFoundExceptionBatch.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 import java.util.Collection;
 import lombok.Getter;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataValidationException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataValidationException.java
index e84ec2db3c..5306819485 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataValidationException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataValidationException.java
@@ -20,7 +20,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 public class DataValidationException extends CpsException {
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataspaceInUseException.java
index 14167315f8..8ceaf1aba2 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceInUseException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataspaceInUseException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Runtime exception.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceNotFoundException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataspaceNotFoundException.java
index 42b77a23be..0be2fec70c 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DataspaceNotFoundException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Dataspace Not Found Exception. Indicates the requested data being absent.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DuplicatedYangResourceException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/DuplicatedYangResourceException.java
index 735e677428..0dec574212 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DuplicatedYangResourceException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/DuplicatedYangResourceException.java
@@ -16,7 +16,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 import lombok.Getter;
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ModelValidationException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/ModelValidationException.java
index b05a3f60eb..d38fe8d048 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ModelValidationException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/ModelValidationException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Yang Model Validation exception.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ModuleNamesNotFoundException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/ModuleNamesNotFoundException.java
index ee4295ea75..977ecec74e 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/ModuleNamesNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/ModuleNamesNotFoundException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 import java.util.Collection;
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/NotFoundInDataspaceException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/NotFoundInDataspaceException.java
index 56a2f87433..71322b7dee 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/NotFoundInDataspaceException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/NotFoundInDataspaceException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Not found in dataspace exception. Indicates the requested data being absent in a given dataspace
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetInUseException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/SchemaSetInUseException.java
index 28bbb5741c..4d481be0aa 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetInUseException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/SchemaSetInUseException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Runtime exception. Thrown when schema set record rejected to be deleted because it has anchor records associated.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetNotFoundException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/SchemaSetNotFoundException.java
index 218918fcb6..e95d907f91 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/SchemaSetNotFoundException.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 /**
  * Schema set not found exception. Indicates the schema set is not found in a given dataspace
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SessionManagerException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/SessionManagerException.java
index 4000bfc51d..d1f32c0744 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SessionManagerException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/SessionManagerException.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 
 public class SessionManagerException extends CpsException {
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SessionTimeoutException.java b/cps-service/src/main/java/org/onap/cps/api/exceptions/SessionTimeoutException.java
index 92b4aa7a8b..6b45e1b891 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SessionTimeoutException.java
+++ b/cps-service/src/main/java/org/onap/cps/api/exceptions/SessionTimeoutException.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions;
+package org.onap.cps.api.exceptions;
 
 @SuppressWarnings("squid:S110")  // Team agreed to accept 6 levels of inheritance for CPS Exceptions
 public class SessionTimeoutException extends SessionManagerException {
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsAnchorServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsAnchorServiceImpl.java
index 5ca0fe63d4..1bd2b6af56 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsAnchorServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsAnchorServiceImpl.java
@@ -23,10 +23,10 @@ package org.onap.cps.api.impl;
 import java.util.Collection;
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.CpsAnchorService;
+import org.onap.cps.api.model.Anchor;
 import org.onap.cps.impl.utils.CpsValidator;
 import org.onap.cps.spi.CpsAdminPersistenceService;
 import org.onap.cps.spi.CpsDataPersistenceService;
-import org.onap.cps.spi.model.Anchor;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java
index a63b3e5360..3b5baf5e68 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java
@@ -39,17 +39,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.CpsAnchorService;
 import org.onap.cps.api.CpsDataService;
 import org.onap.cps.api.CpsDeltaService;
+import org.onap.cps.api.exceptions.DataValidationException;
+import org.onap.cps.api.model.Anchor;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.model.DataNodeBuilder;
+import org.onap.cps.api.model.DeltaReport;
+import org.onap.cps.api.parameters.FetchDescendantsOption;
 import org.onap.cps.cpspath.parser.CpsPathUtil;
 import org.onap.cps.events.CpsDataUpdateEventsService;
 import org.onap.cps.events.model.Data.Operation;
 import org.onap.cps.impl.utils.CpsValidator;
 import org.onap.cps.spi.CpsDataPersistenceService;
-import org.onap.cps.spi.FetchDescendantsOption;
-import org.onap.cps.spi.exceptions.DataValidationException;
-import org.onap.cps.spi.model.Anchor;
-import org.onap.cps.spi.model.DataNode;
-import org.onap.cps.spi.model.DataNodeBuilder;
-import org.onap.cps.spi.model.DeltaReport;
 import org.onap.cps.utils.ContentType;
 import org.onap.cps.utils.DataMapUtils;
 import org.onap.cps.utils.JsonObjectMapper;
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataspaceServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataspaceServiceImpl.java
index 6bccf2a865..af48f202bb 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataspaceServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataspaceServiceImpl.java
@@ -26,9 +26,9 @@ package org.onap.cps.api.impl;
 import java.util.Collection;
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.CpsDataspaceService;
+import org.onap.cps.api.model.Dataspace;
 import org.onap.cps.impl.utils.CpsValidator;
 import org.onap.cps.spi.CpsAdminPersistenceService;
-import org.onap.cps.spi.model.Dataspace;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDeltaServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDeltaServiceImpl.java
index 7819568ae1..a515b5d65a 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDeltaServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDeltaServiceImpl.java
@@ -30,9 +30,9 @@ import java.util.Map;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.CpsDeltaService;
-import org.onap.cps.spi.model.DataNode;
-import org.onap.cps.spi.model.DeltaReport;
-import org.onap.cps.spi.model.DeltaReportBuilder;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.model.DeltaReport;
+import org.onap.cps.api.model.DeltaReportBuilder;
 import org.springframework.stereotype.Service;
 
 @Slf4j
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
index 9f3f2cc571..9f5c0a3853 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
@@ -30,14 +30,14 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.CpsAnchorService;
 import org.onap.cps.api.CpsModuleService;
+import org.onap.cps.api.exceptions.SchemaSetInUseException;
+import org.onap.cps.api.model.Anchor;
+import org.onap.cps.api.model.ModuleDefinition;
+import org.onap.cps.api.model.ModuleReference;
+import org.onap.cps.api.model.SchemaSet;
+import org.onap.cps.api.parameters.CascadeDeleteAllowed;
 import org.onap.cps.impl.utils.CpsValidator;
-import org.onap.cps.spi.CascadeDeleteAllowed;
 import org.onap.cps.spi.CpsModulePersistenceService;
-import org.onap.cps.spi.exceptions.SchemaSetInUseException;
-import org.onap.cps.spi.model.Anchor;
-import org.onap.cps.spi.model.ModuleDefinition;
-import org.onap.cps.spi.model.ModuleReference;
-import org.onap.cps.spi.model.SchemaSet;
 import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder;
 import org.onap.cps.yang.YangTextSchemaSourceSet;
 import org.springframework.stereotype.Service;
diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java
index 1de7c1733e..1d6f0c3ab6 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java
@@ -26,11 +26,11 @@ import java.util.Collection;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.CpsQueryService;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.parameters.FetchDescendantsOption;
+import org.onap.cps.api.parameters.PaginationOption;
 import org.onap.cps.impl.utils.CpsValidator;
 import org.onap.cps.spi.CpsDataPersistenceService;
-import org.onap.cps.spi.FetchDescendantsOption;
-import org.onap.cps.spi.PaginationOption;
-import org.onap.cps.spi.model.DataNode;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/Anchor.java b/cps-service/src/main/java/org/onap/cps/api/model/Anchor.java
index 0c245a478b..68f7920046 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/Anchor.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/Anchor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java b/cps-service/src/main/java/org/onap/cps/api/model/ConditionProperties.java
index 5f5e4bc4ae..a995ba17b4 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/ConditionProperties.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/ConditionProperties.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DataNode.java b/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java
index 76f33bbc14..be80b636ad 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/DataNode.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java
@@ -20,7 +20,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java b/cps-service/src/main/java/org/onap/cps/api/model/DataNodeBuilder.java
index de57914527..d509f53525 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DataNodeBuilder.java
@@ -20,7 +20,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -32,7 +32,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.spi.exceptions.DataValidationException;
+import org.onap.cps.api.exceptions.DataValidationException;
 import org.onap.cps.utils.YangUtils;
 import org.opendaylight.yangtools.yang.common.Ordering;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/Dataspace.java b/cps-service/src/main/java/org/onap/cps/api/model/Dataspace.java
index 23c6d69063..238b8611f0 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/Dataspace.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/Dataspace.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DeltaReport.java b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java
index c6270a41d2..df642628d0 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/DeltaReport.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DeltaReportBuilder.java b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReportBuilder.java
index a7e7aae215..a8e922f3df 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/DeltaReportBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReportBuilder.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleDefinition.java b/cps-service/src/main/java/org/onap/cps/api/model/ModuleDefinition.java
index 909b7bc119..c2f23d6a2d 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleDefinition.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/ModuleDefinition.java
@@ -18,7 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java b/cps-service/src/main/java/org/onap/cps/api/model/ModuleReference.java
index 18d55d5230..a93a510780 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/ModuleReference.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/SchemaSet.java b/cps-service/src/main/java/org/onap/cps/api/model/SchemaSet.java
index bb981482f4..be57d2d3ae 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/model/SchemaSet.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/SchemaSet.java
@@ -19,7 +19,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model;
+package org.onap.cps.api.model;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/cps-service/src/main/java/org/onap/cps/spi/CascadeDeleteAllowed.java b/cps-service/src/main/java/org/onap/cps/api/parameters/CascadeDeleteAllowed.java
index e685434a60..3282032b2d 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/CascadeDeleteAllowed.java
+++ b/cps-service/src/main/java/org/onap/cps/api/parameters/CascadeDeleteAllowed.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi;
+package org.onap.cps.api.parameters;
 
 /**
  * Cascade delete option.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/FetchDescendantsOption.java b/cps-service/src/main/java/org/onap/cps/api/parameters/FetchDescendantsOption.java
index 3b90b06cb0..46022ba46b 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/FetchDescendantsOption.java
+++ b/cps-service/src/main/java/org/onap/cps/api/parameters/FetchDescendantsOption.java
@@ -19,13 +19,13 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi;
+package org.onap.cps.api.parameters;
 
 import com.google.common.base.Strings;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
-import org.onap.cps.spi.exceptions.DataValidationException;
+import org.onap.cps.api.exceptions.DataValidationException;
 
 @RequiredArgsConstructor
 public class FetchDescendantsOption {
diff --git a/cps-service/src/main/java/org/onap/cps/spi/PaginationOption.java b/cps-service/src/main/java/org/onap/cps/api/parameters/PaginationOption.java
index 17f025dba6..29554ae436 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/PaginationOption.java
+++ b/cps-service/src/main/java/org/onap/cps/api/parameters/PaginationOption.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi;
+package org.onap.cps.api.parameters;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/cps-service/src/main/java/org/onap/cps/events/CpsDataUpdateEventsService.java b/cps-service/src/main/java/org/onap/cps/events/CpsDataUpdateEventsService.java
index 1097834880..f1b5ff8d10 100644
--- a/cps-service/src/main/java/org/onap/cps/events/CpsDataUpdateEventsService.java
+++ b/cps-service/src/main/java/org/onap/cps/events/CpsDataUpdateEventsService.java
@@ -28,10 +28,10 @@ import java.util.HashMap;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.onap.cps.api.model.Anchor;
 import org.onap.cps.events.model.CpsDataUpdatedEvent;
 import org.onap.cps.events.model.Data;
 import org.onap.cps.events.model.Data.Operation;
-import org.onap.cps.spi.model.Anchor;
 import org.onap.cps.utils.DateTimeUtility;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
diff --git a/cps-service/src/main/java/org/onap/cps/impl/utils/CpsValidator.java b/cps-service/src/main/java/org/onap/cps/impl/utils/CpsValidator.java
index fd677eb2d2..75bcf126a4 100644
--- a/cps-service/src/main/java/org/onap/cps/impl/utils/CpsValidator.java
+++ b/cps-service/src/main/java/org/onap/cps/impl/utils/CpsValidator.java
@@ -20,7 +20,7 @@
 
 package org.onap.cps.impl.utils;
 
-import org.onap.cps.spi.PaginationOption;
+import org.onap.cps.api.parameters.PaginationOption;
 
 public interface CpsValidator {
 
diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java
index 25830a55de..5b9bbdcd75 100755
--- a/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java
@@ -24,9 +24,9 @@
 package org.onap.cps.spi;
 
 import java.util.Collection;
-import org.onap.cps.spi.exceptions.AlreadyDefinedException;
-import org.onap.cps.spi.model.Anchor;
-import org.onap.cps.spi.model.Dataspace;
+import org.onap.cps.api.exceptions.AlreadyDefinedException;
+import org.onap.cps.api.model.Anchor;
+import org.onap.cps.api.model.Dataspace;
 
 /*
     Service for handling CPS admin data.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsDataPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsDataPersistenceService.java
index bc819163bc..5be5b1e2e0 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/CpsDataPersistenceService.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/CpsDataPersistenceService.java
@@ -27,7 +27,9 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import org.onap.cps.spi.model.DataNode;
+import org.onap.cps.api.model.DataNode;
+import org.onap.cps.api.parameters.FetchDescendantsOption;
+import org.onap.cps.api.parameters.PaginationOption;
 
 /*
     Data Store interface that is responsible for handling yang data.
diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java
index 793f38e4bc..4cfc287a5d 100755
--- a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java
@@ -24,9 +24,9 @@ package org.onap.cps.spi;
 
 import java.util.Collection;
 import java.util.Map;
-import org.onap.cps.spi.model.ModuleDefinition;
-import org.onap.cps.spi.model.ModuleReference;
-import org.onap.cps.spi.model.SchemaSet;
+import org.onap.cps.api.model.ModuleDefinition;
+import org.onap.cps.api.model.ModuleReference;
+import org.onap.cps.api.model.SchemaSet;
 
 /**
  * Service to manage modules.
diff --git a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
index 1ac2bddf88..52cb0eae52 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
@@ -35,9 +35,9 @@ import java.util.List;
 import java.util.Map;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.onap.cps.api.model.DataNode;
 import org.onap.cps.cpspath.parser.CpsPathQuery;
 import org.onap.cps.cpspath.parser.CpsPathUtil;
-import org.onap.cps.spi.model.DataNode;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class DataMapUtils {
diff --git a/cps-service/src/main/java/org/onap/cps/utils/JsonObjectMapper.java b/cps-service/src/main/java/org/onap/cps/utils/JsonObjectMapper.java
index 60a6e16fe7..253c776f4c 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/JsonObjectMapper.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/JsonObjectMapper.java
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.spi.exceptions.DataValidationException;
+import org.onap.cps.api.exceptions.DataValidationException;
 import org.springframework.stereotype.Component;
 
 @Slf4j
diff --git a/cps-service/src/main/java/org/onap/cps/utils/PrefixResolver.java b/cps-service/src/main/java/org/onap/cps/utils/PrefixResolver.java
index c3097cc552..646ed556f5 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/PrefixResolver.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/PrefixResolver.java
@@ -22,10 +22,10 @@ package org.onap.cps.utils;
 
 import lombok.RequiredArgsConstructor;
 import org.onap.cps.api.impl.YangTextSchemaSourceSetCache;
+import org.onap.cps.api.model.Anchor;
 import org.onap.cps.cpspath.parser.CpsPathPrefixType;
 import org.onap.cps.cpspath.parser.CpsPathQuery;
 import org.onap.cps.cpspath.parser.CpsPathUtil;
-import org.onap.cps.spi.model.Anchor;
 import org.onap.cps.yang.YangTextSchemaSourceSet;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
diff --git a/cps-service/src/main/java/org/onap/cps/utils/XmlFileUtils.java b/cps-service/src/main/java/org/onap/cps/utils/XmlFileUtils.java
index bbfb7f4d2e..c9c1ece2c5 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/XmlFileUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/XmlFileUtils.java
@@ -44,7 +44,7 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.onap.cps.spi.exceptions.DataValidationException;
+import org.onap.cps.api.exceptions.DataValidationException;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.w3c.dom.DOMException;
diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangParser.java b/cps-service/src/main/java/org/onap/cps/utils/YangParser.java
index 168e0999d5..7fa10a134a 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/YangParser.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangParser.java
@@ -28,9 +28,9 @@ import io.micrometer.core.annotation.Timed;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.onap.cps.api.exceptions.DataValidationException;
 import org.onap.cps.api.impl.YangTextSchemaSourceSetCache;
-import org.onap.cps.spi.exceptions.DataValidationException;
-import org.onap.cps.spi.model.Anchor;
+import org.onap.cps.api.model.Anchor;
 import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangParserHelper.java b/cps-service/src/main/java/org/onap/cps/utils/YangParserHelper.java
index 5612945ea9..83f7ce220f 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/YangParserHelper.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangParserHelper.java
@@ -38,9 +38,9 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.TransformerException;
 import lombok.RequiredArgsConstructor;
+import org.onap.cps.api.exceptions.DataValidationException;
 import org.onap.cps.cpspath.parser.CpsPathUtil;
 import org.onap.cps.cpspath.parser.PathParsingException;
-import org.onap.cps.spi.exceptions.DataValidationException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
diff --git a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSet.java b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSet.java
index 80f0224c69..e7e04c8393 100644
--- a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSet.java
+++ b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSet.java
@@ -22,7 +22,7 @@
 package org.onap.cps.yang;
 
 import java.util.List;
-import org.onap.cps.spi.model.ModuleReference;
+import org.onap.cps.api.model.ModuleReference;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
diff --git a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java
index 0235b004f4..ab7a095572 100644
--- a/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/yang/YangTextSchemaSourceSetBuilder.java
@@ -36,8 +36,8 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import lombok.NoArgsConstructor;
-import org.onap.cps.spi.exceptions.ModelValidationException;
-import org.onap.cps.spi.model.ModuleReference;
+import org.onap.cps.api.exceptions.ModelValidationException;
+import org.onap.cps.api.model.ModuleReference;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/exceptions/CpsExceptionsSpec.groovy
index 8db1063340..ea9f13e0a4 100755
--- a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/exceptions/CpsExceptionsSpec.groovy
@@ -19,7 +19,8 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.exceptions
+package org.onap.cps.api.exceptions
+
 
 import spock.lang.Specification
 
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAnchorServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAnchorServiceImplSpec.groovy
index ccf943a470..e8617d445d 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAnchorServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAnchorServiceImplSpec.groovy
@@ -23,8 +23,8 @@ package org.onap.cps.api.impl
 import org.onap.cps.impl.utils.CpsValidator
 import org.onap.cps.spi.CpsAdminPersistenceService
 import org.onap.cps.spi.CpsDataPersistenceService
-import org.onap.cps.spi.exceptions.ModuleNamesNotFoundException
-import org.onap.cps.spi.model.Anchor
+import org.onap.cps.api.exceptions.ModuleNamesNotFoundException
+import org.onap.cps.api.model.Anchor
 import spock.lang.Specification
 
 class CpsAnchorServiceImplSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
index 1543fb931b..ff44cb20a2 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
@@ -33,14 +33,14 @@ import org.onap.cps.api.CpsDeltaService
 import org.onap.cps.events.CpsDataUpdateEventsService
 import org.onap.cps.impl.utils.CpsValidator
 import org.onap.cps.spi.CpsDataPersistenceService
-import org.onap.cps.spi.FetchDescendantsOption
-import org.onap.cps.spi.exceptions.ConcurrencyException
-import org.onap.cps.spi.exceptions.DataNodeNotFoundExceptionBatch
-import org.onap.cps.spi.exceptions.DataValidationException
-import org.onap.cps.spi.exceptions.SessionManagerException
-import org.onap.cps.spi.exceptions.SessionTimeoutException
-import org.onap.cps.spi.model.Anchor
-import org.onap.cps.spi.model.DataNodeBuilder
+import org.onap.cps.api.parameters.FetchDescendantsOption
+import org.onap.cps.api.exceptions.ConcurrencyException
+import org.onap.cps.api.exceptions.DataNodeNotFoundExceptionBatch
+import org.onap.cps.api.exceptions.DataValidationException
+import org.onap.cps.api.exceptions.SessionManagerException
+import org.onap.cps.api.exceptions.SessionTimeoutException
+import org.onap.cps.api.model.Anchor
+import org.onap.cps.api.model.DataNodeBuilder
 import org.onap.cps.utils.ContentType
 import org.onap.cps.utils.JsonObjectMapper
 import org.onap.cps.utils.PrefixResolver
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataspaceServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataspaceServiceImplSpec.groovy
index ac7d4c0aa7..ae68929c42 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataspaceServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataspaceServiceImplSpec.groovy
@@ -22,7 +22,7 @@ package org.onap.cps.api.impl
 
 import org.onap.cps.impl.utils.CpsValidator
 import org.onap.cps.spi.CpsAdminPersistenceService
-import org.onap.cps.spi.model.Dataspace
+import org.onap.cps.api.model.Dataspace
 import spock.lang.Specification
 
 class CpsDataspaceServiceImplSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDeltaServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDeltaServiceImplSpec.groovy
index f12afe61ec..65dac62710 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDeltaServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDeltaServiceImplSpec.groovy
@@ -20,7 +20,7 @@
 
 package org.onap.cps.api.impl
 
-import org.onap.cps.spi.model.DataNode
+import org.onap.cps.api.model.DataNode
 import spock.lang.Specification
 
 class CpsDeltaServiceImplSpec extends Specification{
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
index c02b06fd80..97b9f7fffd 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsModuleServiceImplSpec.groovy
@@ -27,20 +27,20 @@ import org.onap.cps.TestUtils
 import org.onap.cps.api.CpsAnchorService
 import org.onap.cps.impl.utils.CpsValidator
 import org.onap.cps.spi.CpsModulePersistenceService
-import org.onap.cps.spi.exceptions.DuplicatedYangResourceException
-import org.onap.cps.spi.exceptions.ModelValidationException
-import org.onap.cps.spi.exceptions.SchemaSetInUseException
-import org.onap.cps.spi.model.Anchor
-import org.onap.cps.spi.model.ModuleDefinition
-import org.onap.cps.spi.model.ModuleReference
-import org.onap.cps.spi.model.SchemaSet
+import org.onap.cps.api.exceptions.DuplicatedYangResourceException
+import org.onap.cps.api.exceptions.ModelValidationException
+import org.onap.cps.api.exceptions.SchemaSetInUseException
+import org.onap.cps.api.model.Anchor
+import org.onap.cps.api.model.ModuleDefinition
+import org.onap.cps.api.model.ModuleReference
+import org.onap.cps.api.model.SchemaSet
 import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder
 import org.onap.cps.yang.YangTextSchemaSourceSet
 import org.onap.cps.yang.YangTextSchemaSourceSetBuilder
 import spock.lang.Specification
 
-import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_ALLOWED
-import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED
+import static org.onap.cps.api.parameters.CascadeDeleteAllowed.CASCADE_DELETE_ALLOWED
+import static org.onap.cps.api.parameters.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED
 
 class CpsModuleServiceImplSpec extends Specification {
 
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy
index 74127e095f..7d2932570e 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy
@@ -23,8 +23,8 @@ package org.onap.cps.api.impl
 
 import org.onap.cps.impl.utils.CpsValidator
 import org.onap.cps.spi.CpsDataPersistenceService
-import org.onap.cps.spi.FetchDescendantsOption
-import org.onap.cps.spi.PaginationOption
+import org.onap.cps.api.parameters.FetchDescendantsOption
+import org.onap.cps.api.parameters.PaginationOption
 import spock.lang.Specification
 
 class CpsQueryServiceImplSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
index 9f3456280e..f2fed7c899 100755
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
@@ -31,7 +31,7 @@ import org.onap.cps.events.CpsDataUpdateEventsService
 import org.onap.cps.impl.utils.CpsValidator

 import org.onap.cps.spi.CpsDataPersistenceService

 import org.onap.cps.spi.CpsModulePersistenceService

-import org.onap.cps.spi.model.Anchor

+import org.onap.cps.api.model.Anchor

 import org.onap.cps.utils.ContentType

 import org.onap.cps.utils.JsonObjectMapper

 import org.onap.cps.utils.PrefixResolver

diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/model/ConditionPropertiesSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/model/ConditionPropertiesSpec.groovy
index c8446902d5..9c6bca6e83 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/model/ConditionPropertiesSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/model/ConditionPropertiesSpec.groovy
@@ -18,10 +18,9 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model
+package org.onap.cps.api.model
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.onap.cps.utils.JsonObjectMapper
 import spock.lang.Specification
 
 class ConditionPropertiesSpec extends Specification {
@@ -30,7 +29,7 @@ class ConditionPropertiesSpec extends Specification {
 
     def 'Condition Properties JSON conversion.'() {
         given: 'a condition properties'
-            def objectUnderTest = new ConditionProperties(conditionName: 'test', conditionParameters: [ [ key : 'value' ] ])
+            def objectUnderTest = new ConditionProperties(conditionName: 'test', conditionParameters: [[key: 'value' ] ])
         expect: 'the name is blank'
             assert objectMapper.writeValueAsString(objectUnderTest) == '{"conditionName":"test","conditionParameters":[{"key":"value"}]}'
     }
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/model/DataNodeBuilderSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/model/DataNodeBuilderSpec.groovy
index f028d5d5d9..24c78864a5 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/model/DataNodeBuilderSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/model/DataNodeBuilderSpec.groovy
@@ -19,10 +19,10 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model
+package org.onap.cps.api.model
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.DataValidationException
+import org.onap.cps.api.exceptions.DataValidationException
 import org.onap.cps.utils.ContentType
 import org.onap.cps.utils.DataMapUtils
 import org.onap.cps.utils.YangParserHelper
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/model/DeltaReportBuilderSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/model/DeltaReportBuilderSpec.groovy
index 00b5499c2f..94e3ed5c26 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/model/DeltaReportBuilderSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/model/DeltaReportBuilderSpec.groovy
@@ -18,7 +18,8 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi.model
+package org.onap.cps.api.model
+
 
 import spock.lang.Specification
 
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/FetchDescendantsOptionSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/parameters/FetchDescendantsOptionSpec.groovy
index c1958472e9..126e5b197b 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/FetchDescendantsOptionSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/parameters/FetchDescendantsOptionSpec.groovy
@@ -19,9 +19,10 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi
+package org.onap.cps.api.parameters
 
-import org.onap.cps.spi.exceptions.DataValidationException
+
+import org.onap.cps.api.exceptions.DataValidationException
 import spock.lang.Specification
 
 class FetchDescendantsOptionSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/PaginationOptionSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/parameters/PaginationOptionSpec.groovy
index 9d74a17222..f2f714834c 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/PaginationOptionSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/parameters/PaginationOptionSpec.groovy
@@ -19,7 +19,8 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.spi
+package org.onap.cps.api.parameters
+
 
 import spock.lang.Specification
 
diff --git a/cps-service/src/test/groovy/org/onap/cps/events/CpsDataUpdateEventsServiceSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/events/CpsDataUpdateEventsServiceSpec.groovy
index 11842645c2..5dee8fc28b 100644
--- a/cps-service/src/test/groovy/org/onap/cps/events/CpsDataUpdateEventsServiceSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/events/CpsDataUpdateEventsServiceSpec.groovy
@@ -30,7 +30,7 @@ import io.cloudevents.CloudEvent
 import io.cloudevents.core.CloudEventUtils
 import io.cloudevents.jackson.PojoCloudEventDataMapper
 import org.onap.cps.events.model.CpsDataUpdatedEvent
-import org.onap.cps.spi.model.Anchor
+import org.onap.cps.api.model.Anchor
 import org.onap.cps.utils.JsonObjectMapper
 import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
index 6b9f9acb3f..bb0f5b0911 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
@@ -22,7 +22,7 @@
 
 package org.onap.cps.utils
 
-import org.onap.cps.spi.model.DataNodeBuilder
+import org.onap.cps.api.model.DataNodeBuilder
 import spock.lang.Specification
 
 class DataMapUtilsSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/JsonObjectMapperSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/JsonObjectMapperSpec.groovy
index 09d45b92c0..ace786a5ab 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/JsonObjectMapperSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/JsonObjectMapperSpec.groovy
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import groovy.json.JsonSlurper
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.DataValidationException
+import org.onap.cps.api.exceptions.DataValidationException
 import spock.lang.Specification
 
 class JsonObjectMapperSpec extends Specification {
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/PrefixResolverSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/PrefixResolverSpec.groovy
index 13b042f1ae..f80678f7d3 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/PrefixResolverSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/PrefixResolverSpec.groovy
@@ -24,7 +24,7 @@ package org.onap.cps.utils
 
 import org.onap.cps.TestUtils
 import org.onap.cps.api.impl.YangTextSchemaSourceSetCache
-import org.onap.cps.spi.model.Anchor
+import org.onap.cps.api.model.Anchor
 import org.onap.cps.yang.YangTextSchemaSourceSet
 import org.onap.cps.yang.YangTextSchemaSourceSetBuilder
 import spock.lang.Specification
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/XmlFileUtilsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/XmlFileUtilsSpec.groovy
index 9a932c9279..268bdc7d35 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/XmlFileUtilsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/XmlFileUtilsSpec.groovy
@@ -22,7 +22,7 @@
 package org.onap.cps.utils
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.DataValidationException
+import org.onap.cps.api.exceptions.DataValidationException
 import org.onap.cps.yang.YangTextSchemaSourceSetBuilder
 import org.w3c.dom.DOMException
 import org.xml.sax.SAXParseException
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/YangParserHelperSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/YangParserHelperSpec.groovy
index e1490c28ab..646faa02db 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/YangParserHelperSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/YangParserHelperSpec.groovy
@@ -21,7 +21,7 @@
 package org.onap.cps.utils
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.DataValidationException
+import org.onap.cps.api.exceptions.DataValidationException
 import org.onap.cps.yang.YangTextSchemaSourceSetBuilder
 import org.opendaylight.yangtools.yang.common.QName
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode
diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/YangParserSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/YangParserSpec.groovy
index 6c52becbe1..62c681eb07 100644
--- a/cps-service/src/test/groovy/org/onap/cps/utils/YangParserSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/YangParserSpec.groovy
@@ -22,8 +22,8 @@
 package org.onap.cps.utils
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.DataValidationException
-import org.onap.cps.spi.model.Anchor
+import org.onap.cps.api.exceptions.DataValidationException
+import org.onap.cps.api.model.Anchor
 import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder
 import org.onap.cps.yang.YangTextSchemaSourceSet
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode
diff --git a/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy
index 2739281bc7..d8f72f004e 100644
--- a/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/yang/YangTextSchemaSourceSetBuilderSpec.groovy
@@ -24,7 +24,7 @@
 package org.onap.cps.yang
 
 import org.onap.cps.TestUtils
-import org.onap.cps.spi.exceptions.ModelValidationException
+import org.onap.cps.api.exceptions.ModelValidationException
 import org.opendaylight.yangtools.yang.common.Revision
 import spock.lang.Specification
 
diff --git a/cps-service/src/test/java/org/onap/cps/TestUtils.java b/cps-service/src/test/java/org/onap/cps/TestUtils.java
index b0684f3acb..87c71b5264 100644
--- a/cps-service/src/test/java/org/onap/cps/TestUtils.java
+++ b/cps-service/src/test/java/org/onap/cps/TestUtils.java
@@ -26,7 +26,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Map;
-import org.onap.cps.spi.model.DataNode;
+import org.onap.cps.api.model.DataNode;
 
 /**
  * Common convenience methods for testing.