58 files changed, 226 insertions, 227 deletions

diff --git a/trustStoreMerger/pom.xml b/trustStoreMerger/pom.xml
index 545dab3a..d150a9b3 100644
--- a/trustStoreMerger/pom.xml
+++ b/trustStoreMerger/pom.xml
@@ -70,7 +70,7 @@
                                     <transformers>
                                         <transformer
                                                 implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                            <mainClass>org.onap.oom.truststoremerger.MainApp</mainClass>
+                                            <mainClass>org.onap.oom.certservice.postprocessor.MainApp</mainClass>
                                         </transformer>
                                     </transformers>
                                 </configuration>
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/AppExecutor.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java
index 309f86fc..2ef30b68 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/AppExecutor.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger;
+package org.onap.oom.certservice.postprocessor;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/AppExitHandler.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java
index e4c26b14..15677dc4 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/AppExitHandler.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java
@@ -17,9 +17,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger;
+package org.onap.oom.certservice.postprocessor;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java
index 0045b2f0..99a66c45 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/CertificatePostProcessor.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java
@@ -17,14 +17,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger;
+package org.onap.oom.certservice.postprocessor;
 
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.configuration.AppConfigurationLoader;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.copier.KeystoreCopier;
-import org.onap.oom.truststoremerger.merger.TruststoreMerger;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.configuration.AppConfigurationLoader;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.copier.KeystoreCopier;
+import org.onap.oom.certservice.postprocessor.merger.TruststoreMerger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/MainApp.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java
index 61112e0a..f815f489 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/MainApp.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger;
+package org.onap.oom.certservice.postprocessor;
 
 public class MainApp {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/CertificateConstants.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java
index 75756aa1..629397e4 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/CertificateConstants.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.api;
+package org.onap.oom.certservice.postprocessor.api;
 
 public class CertificateConstants {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/ExitStatus.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java
index 2c3945c5..b6cebeb1 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/ExitStatus.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.api;
+package org.onap.oom.certservice.postprocessor.api;
 
 public enum ExitStatus {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/ExitableException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java
index 1454e6bd..54a7c6a1 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/api/ExitableException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.api;
+package org.onap.oom.certservice.postprocessor.api;
 
 public class ExitableException extends RuntimeException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/ExtensionResolver.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java
index af792c48..7a785ae1 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/ExtensionResolver.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import java.io.File;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/FileTools.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java
index 87b0e83d..620d8088 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/FileTools.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java
@@ -17,14 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
 import org.apache.commons.io.FileUtils;
-import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
+import org.onap.oom.certservice.postprocessor.merger.exception.CreateBackupException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/PasswordReader.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java
index d84be5ac..503e21b8 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/common/PasswordReader.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java
@@ -17,12 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
 
 public final class PasswordReader {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationLoader.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java
index 0f538e1d..a0a00a6d 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationLoader.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java
@@ -17,12 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration;
+package org.onap.oom.certservice.postprocessor.configuration;
 
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsSplitter;
-import org.onap.oom.truststoremerger.configuration.path.env.EnvReader;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.configuration.path.DelimitedPathsSplitter;
+import org.onap.oom.certservice.postprocessor.configuration.path.env.EnvReader;
 
 public class AppConfigurationLoader {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java
index 3adea9ab..79e223c5 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProvider.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java
@@ -17,23 +17,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration;
+package org.onap.oom.certservice.postprocessor.configuration;
 
 
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import org.onap.oom.truststoremerger.configuration.exception.CertificatesPathsValidationException;
-import org.onap.oom.truststoremerger.configuration.exception.ConfigurationException;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.configuration.model.EnvVariable;
-import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsSplitter;
-import org.onap.oom.truststoremerger.configuration.path.env.EnvReader;
+import org.onap.oom.certservice.postprocessor.configuration.path.env.EnvReader;
+import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException;
+import org.onap.oom.certservice.postprocessor.configuration.exception.ConfigurationException;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable;
+import org.onap.oom.certservice.postprocessor.configuration.path.DelimitedPathsSplitter;
 
 public class AppConfigurationProvider {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/CertificatesPathsValidationException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java
index 1069a0fe..fb621017 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/CertificatesPathsValidationException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.exception;
+package org.onap.oom.certservice.postprocessor.configuration.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class CertificatesPathsValidationException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/ConfigurationException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java
index ffb99dae..c9f9a416 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/exception/ConfigurationException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.exception;
+package org.onap.oom.certservice.postprocessor.configuration.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class ConfigurationException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/AppConfiguration.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java
index 9da7c6a7..d28dcac5 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/AppConfiguration.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.model;
+package org.onap.oom.certservice.postprocessor.configuration.model;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java
index 3f4c73da..42028521 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/model/EnvVariable.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java
@@ -17,14 +17,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.model;
+package org.onap.oom.certservice.postprocessor.configuration.model;
 
-import static org.onap.oom.truststoremerger.configuration.path.validation.ValidationFunctions.doesItContainValidCertificatesPaths;
-import static org.onap.oom.truststoremerger.configuration.path.validation.ValidationFunctions.doesItContainValidPasswordPaths;
-import static org.onap.oom.truststoremerger.configuration.path.validation.ValidationFunctions.doesItContainValidPathsToCopy;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidCertificatesPaths;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidPasswordPaths;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidPathsToCopy;
 
 import java.util.List;
 import java.util.function.Predicate;
+import org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions;
 
 public enum EnvVariable {
     TRUSTSTORES_PATHS(true, doesItContainValidCertificatesPaths()),
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/DelimitedPathsSplitter.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java
index b7a4f4c5..b2e71cb3 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/DelimitedPathsSplitter.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java
@@ -17,13 +17,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path;
+package org.onap.oom.certservice.postprocessor.configuration.path;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import org.onap.oom.truststoremerger.configuration.exception.CertificatesPathsValidationException;
-import org.onap.oom.truststoremerger.configuration.model.EnvVariable;
+import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException;
+import org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable;
 
 public class DelimitedPathsSplitter {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/env/EnvReader.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java
index cb6099c1..f30e43be 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/env/EnvReader.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path.env;
+package org.onap.oom.certservice.postprocessor.configuration.path.env;
 
 import java.util.Optional;
 import org.slf4j.Logger;
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/validation/ValidationFunctions.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java
index 535d2e6e..f65a21a0 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/path/validation/ValidationFunctions.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path.validation;
+package org.onap.oom.certservice.postprocessor.configuration.path.validation;
 
 import java.util.List;
 import java.util.function.Predicate;
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/KeystoreCopier.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java
index 7678397a..eba59fd6 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/KeystoreCopier.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java
@@ -17,15 +17,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.copier;
+package org.onap.oom.certservice.postprocessor.copier;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.copier.exception.KeystoreFileCopyException;
-import org.onap.oom.truststoremerger.copier.exception.KeystoreNotExistException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.copier.exception.KeystoreFileCopyException;
+import org.onap.oom.certservice.postprocessor.copier.exception.KeystoreNotExistException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/exception/KeystoreFileCopyException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java
index 80d3c67d..66190965 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/exception/KeystoreFileCopyException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.copier.exception;
+package org.onap.oom.certservice.postprocessor.copier.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class KeystoreFileCopyException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/exception/KeystoreNotExistException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java
index ef2d7761..37f2f537 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/copier/exception/KeystoreNotExistException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.copier.exception;
+package org.onap.oom.certservice.postprocessor.copier.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class KeystoreNotExistException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java
index 9108fb69..59800b13 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProvider.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java
@@ -17,16 +17,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger;
+package org.onap.oom.certservice.postprocessor.merger;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
-import org.onap.oom.truststoremerger.merger.model.TruststoreFactory;
-import org.onap.oom.truststoremerger.merger.model.Truststore;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.certservice.postprocessor.merger.model.Truststore;
+import org.onap.oom.certservice.postprocessor.merger.model.TruststoreFactory;
 
 public class TruststoreFilesProvider {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreMerger.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java
index ad8cff9d..9bc3dd82 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/TruststoreMerger.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java
@@ -17,13 +17,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger;
+package org.onap.oom.certservice.postprocessor.merger;
 
 import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.merger.model.Truststore;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.merger.model.Truststore;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
 
 public class TruststoreMerger {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/AliasConflictException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java
index 71df3a45..2e7939b7 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/AliasConflictException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class AliasConflictException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/CreateBackupException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java
index f655a9f5..8e99f993 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/CreateBackupException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class CreateBackupException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/KeystoreInstanceException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java
index 99a955d9..1279dff7 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/KeystoreInstanceException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class KeystoreInstanceException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/LoadTruststoreException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java
index 810bf556..b3493fd6 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/LoadTruststoreException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class LoadTruststoreException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/MissingTruststoreException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java
index 9065c9d3..51660f60 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/MissingTruststoreException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class MissingTruststoreException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/PasswordReaderException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java
index 9f9d2e27..b1bdf1ea 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/PasswordReaderException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class PasswordReaderException extends ExitableException {
     public PasswordReaderException(String errorMessage) {
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreDataOperationException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java
index c18cb006..77ae366e 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreDataOperationException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class TruststoreDataOperationException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreFileFactoryException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java
index f802a9d3..a87a62a3 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/TruststoreFileFactoryException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class TruststoreFileFactoryException extends ExitableException {
     public TruststoreFileFactoryException(String errorMessage) {
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/WriteTruststoreFileException.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java
index fe368868..f9b772ca 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/exception/WriteTruststoreFileException.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java
@@ -18,10 +18,10 @@
  */
 
 
-package org.onap.oom.truststoremerger.merger.exception;
+package org.onap.oom.certservice.postprocessor.merger.exception;
 
-import org.onap.oom.truststoremerger.api.ExitStatus;
-import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.api.ExitStatus;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
 
 public class WriteTruststoreFileException extends ExitableException {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststore.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java
index 6aa8b569..d264d2f4 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststore.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,15 +27,15 @@ import java.security.KeyStoreException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
+import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.certservice.postprocessor.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAliasFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java
index d40cfb1a..c36510c6 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreFactory.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java
@@ -17,15 +17,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import java.io.File;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
-import org.onap.oom.truststoremerger.common.PasswordReader;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.common.PasswordReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/PemTruststore.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java
index 4617142a..d7f4bfd2 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/PemTruststore.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
-import static org.onap.oom.truststoremerger.api.CertificateConstants.BOUNCY_CASTLE_PROVIDER;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.BOUNCY_CASTLE_PROVIDER;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.X_509_CERTIFICATE;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,12 +37,12 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
 import org.bouncycastle.util.io.pem.PemObjectGenerator;
 import org.bouncycastle.util.io.pem.PemWriter;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
+import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.certservice.postprocessor.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAliasFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/Truststore.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java
index 84239875..51722d0e 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/Truststore.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java
@@ -17,14 +17,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import java.io.File;
 import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.merger.exception.CreateBackupException;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
 
 public abstract class Truststore {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java
index 7e4b71e3..b6984f36 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactory.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java
@@ -17,17 +17,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
-import static org.onap.oom.truststoremerger.api.CertificateConstants.JKS_TYPE;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.PKCS12_TYPE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.JKS_TYPE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.PKCS12_TYPE;
 
 import java.io.File;
-import org.onap.oom.truststoremerger.common.ExtensionResolver;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.common.ExtensionResolver;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException;
 
 public class TruststoreFactory {
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAlias.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java
index 990a1c66..098ffcd0 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAlias.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model.certificate;
+package org.onap.oom.certservice.postprocessor.merger.model.certificate;
 
 import java.security.cert.Certificate;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAliasFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java
index ce3c0c47..4ad2b417 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/CertificateWithAliasFactory.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model.certificate;
+package org.onap.oom.certservice.postprocessor.merger.model.certificate;
 
 import java.security.cert.Certificate;
 
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGenerator.java b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java
index b812fcb3..a89b1031 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGenerator.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model.certificate;
+package org.onap.oom.certservice.postprocessor.merger.model.certificate;
 
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/AppExecutorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java
index bf5196e9..5c79f6e9 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/AppExecutorTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java
@@ -18,21 +18,21 @@
  */
 
 
-package org.onap.oom.truststoremerger;
+package org.onap.oom.certservice.postprocessor;
 
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;
-import static org.onap.oom.truststoremerger.api.ExitStatus.ALIAS_CONFLICT_EXCEPTION;
-import static org.onap.oom.truststoremerger.api.ExitStatus.SUCCESS;
-import static org.onap.oom.truststoremerger.api.ExitStatus.UNEXPECTED_EXCEPTION;
+import static org.onap.oom.certservice.postprocessor.api.ExitStatus.ALIAS_CONFLICT_EXCEPTION;
+import static org.onap.oom.certservice.postprocessor.api.ExitStatus.SUCCESS;
+import static org.onap.oom.certservice.postprocessor.api.ExitStatus.UNEXPECTED_EXCEPTION;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
+import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException;
 
 @ExtendWith(MockitoExtension.class)
 public class AppExecutorTest {
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/ExtensionResolverTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java
index 0ed17d0c..8450ab6d 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/ExtensionResolverTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/FileToolsTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java
index 72181d22..56f76e17 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/FileToolsTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,11 +25,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
-import org.onap.oom.truststoremerger.merger.model.TestCertificateProvider;
 
 public class FileToolsTest {
 
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java
index a43951bd..697eaa83 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java
@@ -17,12 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.common;
+package org.onap.oom.certservice.postprocessor.common;
 
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProviderTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java
index b0f73d09..24e2dab8 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/AppConfigurationProviderTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java
@@ -17,15 +17,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration;
+package org.onap.oom.certservice.postprocessor.configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.when;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.KEYSTORE_DESTINATION_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.KEYSTORE_SOURCE_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,11 +35,11 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.configuration.exception.CertificatesPathsValidationException;
-import org.onap.oom.truststoremerger.configuration.exception.ConfigurationException;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsSplitter;
-import org.onap.oom.truststoremerger.configuration.path.env.EnvReader;
+import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException;
+import org.onap.oom.certservice.postprocessor.configuration.exception.ConfigurationException;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.configuration.path.DelimitedPathsSplitter;
+import org.onap.oom.certservice.postprocessor.configuration.path.env.EnvReader;
 
 @ExtendWith(MockitoExtension.class)
 class AppConfigurationProviderTest {
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/DelimitedPathsSplitterTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java
index 04e96054..be1bc394 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/DelimitedPathsSplitterTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java
@@ -17,19 +17,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path;
+package org.onap.oom.certservice.postprocessor.configuration.path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PATHS;
 
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.configuration.exception.CertificatesPathsValidationException;
+import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException;
 
 @ExtendWith(MockitoExtension.class)
 class DelimitedPathsSplitterTest {
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/env/EnvReaderTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java
index c84c34f2..343e5655 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/env/EnvReaderTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java
@@ -17,12 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path.env;
+package org.onap.oom.certservice.postprocessor.configuration.path.env;
 
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
-import static org.onap.oom.truststoremerger.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
+import static org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable.TRUSTSTORES_PASSWORDS_PATHS;
 
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/validation/ValidationFunctionsTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java
index 3c3760f2..f65147a9 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/configuration/path/validation/ValidationFunctionsTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java
@@ -17,12 +17,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.configuration.path.validation;
+package org.onap.oom.certservice.postprocessor.configuration.path.validation;
 
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.oom.truststoremerger.configuration.path.validation.ValidationFunctions.doesItContainValidCertificatesPaths;
-import static org.onap.oom.truststoremerger.configuration.path.validation.ValidationFunctions.doesItContainValidPasswordPaths;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidCertificatesPaths;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidPasswordPaths;
+import static org.onap.oom.certservice.postprocessor.configuration.path.validation.ValidationFunctions.doesItContainValidPathsToCopy;
 
 import java.util.Arrays;
 import java.util.List;
@@ -106,7 +107,7 @@ class ValidationFunctionsTest {
         List<String> sourcePaths = Arrays.asList("/opt/dcae/cacert/external/keystore.p12",
             "/opt/dcae/cacert/external/keystore.pass");
         // when
-        boolean result = ValidationFunctions.doesItContainValidPathsToCopy().test(sourcePaths);
+        boolean result = doesItContainValidPathsToCopy().test(sourcePaths);
         // then
         assertThat(result).isTrue();
     }
@@ -116,7 +117,7 @@ class ValidationFunctionsTest {
         // given
         List<String> sourcePaths = Arrays.asList("/opt/dcae/cacert/cert.p12","/opt/dcae/cacert/p12.pass");
         // when
-        boolean result = ValidationFunctions.doesItContainValidPathsToCopy().test(sourcePaths);
+        boolean result = doesItContainValidPathsToCopy().test(sourcePaths);
         // then
         assertThat(result).isTrue();
     }
@@ -126,7 +127,7 @@ class ValidationFunctionsTest {
         // given
         List<String> sourcePaths = Arrays.asList("/opt/dcae/cacert/cert.txt","/opt/dcae/cacert/p12.other");
         // when
-        boolean result = ValidationFunctions.doesItContainValidPathsToCopy().test(sourcePaths);
+        boolean result = doesItContainValidPathsToCopy().test(sourcePaths);
         // then
         assertThat(result).isFalse();
     }
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/copier/KeystoreCopierTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java
index ca456bce..99193a8d 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/copier/KeystoreCopierTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.copier;
+package org.onap.oom.certservice.postprocessor.copier;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,10 +26,10 @@ import java.util.Collections;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.onap.oom.truststoremerger.common.FileTools;
-import org.onap.oom.truststoremerger.configuration.model.AppConfiguration;
-import org.onap.oom.truststoremerger.copier.exception.KeystoreFileCopyException;
-import org.onap.oom.truststoremerger.copier.exception.KeystoreNotExistException;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
+import org.onap.oom.certservice.postprocessor.configuration.model.AppConfiguration;
+import org.onap.oom.certservice.postprocessor.copier.exception.KeystoreFileCopyException;
+import org.onap.oom.certservice.postprocessor.copier.exception.KeystoreNotExistException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProviderTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java
index 9fc00a42..9040b53d 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/TruststoreFilesProviderTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java
@@ -18,19 +18,19 @@
  */
 
 
-package org.onap.oom.truststoremerger.merger;
+package org.onap.oom.certservice.postprocessor.merger;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
-import org.onap.oom.truststoremerger.merger.model.Truststore;
-import org.onap.oom.truststoremerger.merger.model.TruststoreFactory;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.certservice.postprocessor.merger.model.Truststore;
+import org.onap.oom.certservice.postprocessor.merger.model.TruststoreFactory;
 
 class TruststoreFilesProviderTest {
 
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java
index 99b8e623..93a5359b 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java
@@ -17,16 +17,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
-import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.merger.exception.AliasConflictException;
+import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
 
 class JavaTruststoreTest {
 
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/PemTruststoreTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java
index 505a6826..af254896 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/PemTruststoreTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -31,11 +31,11 @@ import java.security.cert.Certificate;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.certservice.postprocessor.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
 
 class PemTruststoreTest {
 
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TestCertificateProvider.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java
index abd77d19..f32e09ce 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TestCertificateProvider.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java
@@ -17,10 +17,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
-import static org.onap.oom.truststoremerger.api.CertificateConstants.JKS_TYPE;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.PKCS12_TYPE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.JKS_TYPE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.PKCS12_TYPE;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,9 +28,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
 
 public final class TestCertificateProvider {
 
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java
index eb6c847a..42bf533a 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -26,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreFileFactoryException;
 
 @ExtendWith(MockitoExtension.class)
 class TruststoreFactoryTest {
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java
index 6c294834..8ef148a8 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java
@@ -17,13 +17,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model;
+package org.onap.oom.certservice.postprocessor.merger.model;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
+import static org.onap.oom.certservice.postprocessor.api.CertificateConstants.X_509_CERTIFICATE;
+import static org.onap.oom.certservice.postprocessor.merger.model.TestCertificateProvider.PEM_BACKUP_FILE_PATH;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,15 +38,16 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
-import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
-import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
+import org.onap.oom.certservice.postprocessor.api.CertificateConstants;
+import org.onap.oom.certservice.postprocessor.api.ExitableException;
+import org.onap.oom.certservice.postprocessor.merger.exception.CreateBackupException;
+import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
+import org.onap.oom.certservice.postprocessor.merger.exception.LoadTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
+import org.onap.oom.certservice.postprocessor.merger.exception.PasswordReaderException;
+import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAliasFactory;
 
 class TruststoreTest {
 
@@ -66,7 +68,7 @@ class TruststoreTest {
         truststore.createBackup();
 
         //then
-        File backupFile = new File(TestCertificateProvider.PEM_BACKUP_FILE_PATH);
+        File backupFile = new File(PEM_BACKUP_FILE_PATH);
         assertThat(backupFile.getName().endsWith(BACKUP_EXTENSION)).isTrue();
         assertThat(backupFile.isFile()).isTrue();
     }
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGeneratorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java
index 4ff3e750..bde23003 100644
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/certificate/PemAliasGeneratorTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java
@@ -17,7 +17,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.merger.model.certificate;
+package org.onap.oom.certservice.postprocessor.merger.model.certificate;
 
 import static org.assertj.core.api.Assertions.assertThat;