Package rename

Step 2: package rename, fix pom.xml, fix integration tests Issue-ID: INT-1869 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: Ia4c6823e4facc3791583fb39caba3bcc125b3af7
author: Bogumil Zebek <bogumil.zebek@nokia.com> 2021-03-10 12:55:08 +0100
committer: Zebek Bogumil <bogumil.zebek@nokia.com> 2021-03-10 12:55:08 +0100
commit: bae12bf7d5a92a4d6be22e9ce8c3dc9878c59f36 (patch)
tree: 5cbb50a4c336d7ebee4c402f20f0e036a3bca814
parent: 4af5241ab25b0103d8ea680789aaf9a8696dfc75 (diff)
125 files changed, 346 insertions, 448 deletions
diff --git a/Dockerfile b/Dockerfile
index ae26b36..5e571ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ ADD certificates  /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 CMD python /opt/db/config/mongo_db_schema_creation.py \
     && if [ -f /app/store/trust.pass ]; then cp /app/store/trust.pass /app/store/truststore.pass; fi \
-    && java -Dspring.config.location=file:/app/application.properties  -cp /app/libs/*:/app/vesclient.jar org.onap.pnfsimulator.Main \
+    && java -Dspring.config.location=file:/app/application.properties  -cp /app/libs/*:/app/vesclient.jar org.onap.integration.simulators.nfsimulator.vesclient.Main \
diff --git a/integration/pom.xml b/integration/pom.xml
index e56d838..834c6ae 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -24,14 +24,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.integration.nfsimulator</groupId>
-        <artifactId>vesclient</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>pnf-simulator-integration</artifactId>
+    <groupId>org.onap.integration.simulators.nf-simulator.ves-client</groupId>
+    <artifactId>vesclient-integration</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>vesclient-integration</name>
 
@@ -47,6 +41,13 @@
         <maven.compiler.target>11</maven.compiler.target>
         <rest-assured.version>3.2.0</rest-assured.version>
         <mongo-java-driver.version>3.9.1</mongo-java-driver.version>
+        <spring-boot-starter.version>2.1.6.RELEASE</spring-boot-starter.version>
+        <spring-boot-starter-web.version>2.1.6.RELEASE</spring-boot-starter-web.version>
+        <spring-test.version>5.0.4.RELEASE</spring-test.version>
+        <spring-boot-starter-test.version>2.1.6.RELEASE</spring-boot-starter-test.version>
+        <gson.version>2.8.2</gson.version>
+        <docker-compose-rule-junit4.version>0.34.0</docker-compose-rule-junit4.version>
+        <assertj-core.version>3.19.0</assertj-core.version>
     </properties>
 
     <dependencies>
@@ -54,16 +55,19 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot-starter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-starter-web.version}</version>
         </dependency>
 
         <dependency>
@@ -80,20 +84,24 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-starter-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.palantir.docker.compose</groupId>
             <artifactId>docker-compose-rule-junit4</artifactId>
+            <version>${docker-compose-rule-junit4.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/Main.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/Main.java
index 7288c2a..af3cdcc 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/Main.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/Main.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorController.java
index 304df60..ee5c380 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorController.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorService.java b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorService.java
index 65e5d3e..f53864c 100644
--- a/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorService.java
+++ b/integration/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VesSimulatorService.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.JsonObject;
 import org.springframework.stereotype.Service;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java
index 323243c..268d738 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/BasicAvailabilityTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/BasicAvailabilityTest.java
@@ -18,24 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.RestAssured.when;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
 
 import java.io.IOException;
-import java.net.Inet4Address;
-import java.net.NetworkInterface;
-import java.net.SocketException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.UUID;
 
 import io.restassured.response.Response;
@@ -71,7 +66,7 @@ public class BasicAvailabilityTest {
 
     @Before
     public void setUp() throws Exception {
-        currenVesSimulatorIp = getCurrentIpAddress();
+        currenVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java
index 50ad1cd..33dcf97 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/OptionalTemplatesTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/OptionalTemplatesTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,16 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.COMMON_EVENT_HEADER;
-import static org.onap.pnfsimulator.integration.TestUtils.PATCHED;
-import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL;
-import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
 import java.time.Instant;
@@ -58,7 +53,7 @@ public class OptionalTemplatesTest {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
@@ -92,7 +87,7 @@ public class OptionalTemplatesTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -105,22 +100,22 @@ public class OptionalTemplatesTest {
 
         JsonObject value = parameterCaptor.getValue();
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("sourceName").getAsString()).isEqualTo("Single_sourceName");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId1").getAsString()).hasSize(20);
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId2").getAsString()).isEqualTo("10");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId3").getAsString()).isEqualTo("1");
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId4").getAsInt()).isEqualTo(10);
         assertThat(value
-            .getAsJsonObject(COMMON_EVENT_HEADER)
+            .getAsJsonObject(TestUtils.COMMON_EVENT_HEADER)
             .get("eventId5").getAsLong()).isBetween(currentTimestamp, afterExecution);
     }
 
@@ -143,7 +138,7 @@ public class OptionalTemplatesTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -153,8 +148,8 @@ public class OptionalTemplatesTest {
             Mockito.timeout(3000))
             .sendEventToDmaapV5(parameterCaptor.capture());
 
-        Document sourceNameInMongoDB = findSourceNameInMongoDB();
-        Assertions.assertThat(sourceNameInMongoDB.get(PATCHED))
+        Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB();
+        Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED))
             .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}");
     }
 
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java
index 9d4ff3b..a0d8742 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/SearchInTemplatesTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SearchInTemplatesTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static java.nio.file.Files.readAllBytes;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java
index 3ad1385..7d15842 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/SingleEventTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/SingleEventTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.google.gson.JsonObject;
 import org.assertj.core.api.Assertions;
@@ -40,10 +40,6 @@ import java.util.List;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.stringContainsInOrder;
-import static org.onap.pnfsimulator.integration.TestUtils.PATCHED;
-import static org.onap.pnfsimulator.integration.TestUtils.SINGLE_EVENT_URL;
-import static org.onap.pnfsimulator.integration.TestUtils.findSourceNameInMongoDB;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {Main.class, TestConfiguration.class}, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -56,7 +52,7 @@ public class SingleEventTest {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @After
@@ -82,7 +78,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(421)
             .body("message",
@@ -107,7 +103,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.BAD_REQUEST.value())
             .body("message",
@@ -134,7 +130,7 @@ public class SingleEventTest {
             .contentType("application/json")
             .body(body)
             .when()
-            .post(SINGLE_EVENT_URL)
+            .post(TestUtils.SINGLE_EVENT_URL)
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .body("message", equalTo("Accepted"));
@@ -144,8 +140,8 @@ public class SingleEventTest {
             Mockito.timeout(3000))
             .sendEventToDmaapV5(parameterCaptor.capture());
 
-        Document sourceNameInMongoDB = findSourceNameInMongoDB();
-        Assertions.assertThat(sourceNameInMongoDB.get(PATCHED))
+        Document sourceNameInMongoDB = TestUtils.findSourceNameInMongoDB();
+        Assertions.assertThat(sourceNameInMongoDB.get(TestUtils.PATCHED))
             .isEqualTo("{\"commonEventHeader\":{\"sourceName\":\"HistoricalEvent\",\"version\":3}}");
     }
 }
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java
index 7e74dd4..ecaa0db 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TemplatesManagementTest.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TemplatesManagementTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java
index 19ae050..cbfca42 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestConfiguration.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestConfiguration.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java
index f7df5e9..8ad3ddd 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/TestUtils.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/TestUtils.java
@@ -1,4 +1,4 @@
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java
index ae7970c..da93e60 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/VariablesReplacement.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/VariablesReplacement.java
@@ -1,15 +1,10 @@
-package org.onap.pnfsimulator.integration;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.onap.pnfsimulator.integration.TestUtils.getCurrentIpAddress;
 
 import com.google.gson.JsonObject;
-import java.net.Inet4Address;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +26,7 @@ public class VariablesReplacement {
 
     @Before
     public void setUp() throws Exception {
-        currentVesSimulatorIp = getCurrentIpAddress();
+        currentVesSimulatorIp = TestUtils.getCurrentIpAddress();
     }
 
     @Test
diff --git a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java
index f6a4c24..16638ac 100644
--- a/integration/src/test/java/org/onap/pnfsimulator/integration/suites/DockerBasedTestsSuite.java
+++ b/integration/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/integration/suites/DockerBasedTestsSuite.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.integration.suites;
+package org.onap.integration.simulators.nfsimulator.vesclient.integration.suites;
 
 import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.waiting.HealthChecks;
@@ -27,12 +27,12 @@ import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-import org.onap.pnfsimulator.integration.BasicAvailabilityTest;
-import org.onap.pnfsimulator.integration.OptionalTemplatesTest;
-import org.onap.pnfsimulator.integration.SearchInTemplatesTest;
-import org.onap.pnfsimulator.integration.SingleEventTest;
-import org.onap.pnfsimulator.integration.TemplatesManagementTest;
-import org.onap.pnfsimulator.integration.VariablesReplacement;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.OptionalTemplatesTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.BasicAvailabilityTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.SearchInTemplatesTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.SingleEventTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.TemplatesManagementTest;
+import org.onap.integration.simulators.nfsimulator.vesclient.integration.VariablesReplacement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
diff --git a/pom.xml b/pom.xml
index 546d44a..2d45894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
-        <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class>
+        <simulator.main.class>org.onap.integration.simulators.nfsimulator.vesclient.Main</simulator.main.class>
         <docker.image.tag>latest</docker.image.tag>
         <dependency.directory.name>libs</dependency.directory.name>
         <dependency.directory.location>${project.build.directory}/${dependency.directory.name}
@@ -149,11 +149,6 @@
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
             <version>${spring-boot-starter-data-mongodb.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
-<!--            <version>${spring-boot-starter-actuator.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-client</artifactId>
@@ -170,21 +165,6 @@
             <artifactId>logback-classic</artifactId>
             <version>${logback-classic.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>ch.qos.logback</groupId>-->
-<!--            <artifactId>logback-core</artifactId>-->
-<!--            <version>${logback-classic.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.slf4j</groupId>-->
-<!--            <artifactId>slf4j-api</artifactId>-->
-<!--            <version>${slf4j-api.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>commons-io</groupId>-->
-<!--            <artifactId>commons-io</artifactId>-->
-<!--            <version>${commons-io.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -200,32 +180,11 @@
             <artifactId>httpclient</artifactId>
             <version>${apache.httpclient.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.google.guava</groupId>-->
-<!--            <artifactId>guava</artifactId>-->
-<!--            <version>${guava.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>commons-cli</groupId>-->
-<!--            <artifactId>commons-cli</artifactId>-->
-<!--            <version>${commons-cli.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>com.fasterxml.jackson.datatype</groupId>-->
-<!--            <artifactId>jackson-datatype-jdk8</artifactId>-->
-<!--            <version>${jackson-datatype-jdk8.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.fasterxml.jackson.datatype</groupId>-->
-<!--            <artifactId>jackson-datatype-jsr310</artifactId>-->
-<!--            <version>${jackson-datatype-jsr310.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>io.vavr</groupId>
             <artifactId>vavr-match</artifactId>
@@ -265,36 +224,6 @@
             <scope>test</scope>
             <version>${junit-jupiter-engine.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.junit.jupiter</groupId>-->
-<!--            <artifactId>junit-jupiter-migrationsupport</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--            <version>${junit-jupiter-migrationsupport.version}</version>-->
-<!--        </dependency>-->
-<!--      <dependency>-->
-<!--        <groupId>org.skyscreamer</groupId>-->
-<!--        <artifactId>jsonassert</artifactId>-->
-<!--        <scope>test</scope>-->
-<!--          <version>${jsonassert.version}</version>-->
-<!--      </dependency>-->
-<!--      <dependency>-->
-<!--            <groupId>org.assertj</groupId>-->
-<!--            <artifactId>assertj-core</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--          <version>${assertj-core.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.mockito</groupId>-->
-<!--            <artifactId>mockito-core</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--            <version>${mockito-core.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework</groupId>-->
-<!--            <artifactId>spring-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--            <version>${spring-test.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/java/org/onap/pnfsimulator/Main.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/Main.java
index 708f27f..17ff65b 100644
--- a/src/main/java/org/onap/pnfsimulator/Main.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/Main.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator;
+package org.onap.integration.simulators.nfsimulator.vesclient;
 
 import javax.annotation.PostConstruct;
 
-import org.onap.pnfsimulator.filesystem.WatcherService;
-import org.onap.pnfsimulator.template.FsToDbTemplateSynchronizer;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.FsToDbTemplateSynchronizer;
+import org.onap.integration.simulators.nfsimulator.vesclient.filesystem.WatcherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/org/onap/pnfsimulator/SwaggerConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/SwaggerConfig.java
index b6c6187..c709729 100644
--- a/src/main/java/org/onap/pnfsimulator/SwaggerConfig.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/SwaggerConfig.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator;
+package org.onap.integration.simulators.nfsimulator.vesclient;
 
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/pnfsimulator/db/Row.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Row.java
index 12745bf..cd9edff 100644
--- a/src/main/java/org/onap/pnfsimulator/db/Row.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Row.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.db;
+package org.onap.integration.simulators.nfsimulator.vesclient.db;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/org/onap/pnfsimulator/db/Storage.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Storage.java
index ad98ce0..7e9a378 100644
--- a/src/main/java/org/onap/pnfsimulator/db/Storage.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/db/Storage.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.db;
+package org.onap.integration.simulators.nfsimulator.vesclient.db;
 
 import com.google.gson.JsonObject;
 
diff --git a/src/main/java/org/onap/pnfsimulator/event/EventData.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventData.java
index ff85367..7ebdfba 100644
--- a/src/main/java/org/onap/pnfsimulator/event/EventData.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.event;
+package org.onap.integration.simulators.nfsimulator.vesclient.event;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
diff --git a/src/main/java/org/onap/pnfsimulator/event/EventDataRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataRepository.java
index d1a66ab..67f4e2f 100644
--- a/src/main/java/org/onap/pnfsimulator/event/EventDataRepository.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataRepository.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.event;
+package org.onap.integration.simulators.nfsimulator.vesclient.event;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
diff --git a/src/main/java/org/onap/pnfsimulator/event/EventDataService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataService.java
index 266d56b..638afee 100644
--- a/src/main/java/org/onap/pnfsimulator/event/EventDataService.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.event;
+package org.onap.integration.simulators.nfsimulator.vesclient.event;
 
 import com.google.gson.JsonObject;
 
diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherConfig.java
index 3535e33..3d99a03 100644
--- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherConfig.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessor.java
index c03491a..15c5d7b 100644
--- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessor.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -36,8 +36,8 @@ import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.BSONException;
 import org.bson.json.JsonParseException;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 import org.bson.Document;
 
 @Slf4j
diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherService.java
index 26b684d..3d1a9cf 100644
--- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherService.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherThread.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherThread.java
index a202b1f..4695ff4 100644
--- a/src/main/java/org/onap/pnfsimulator/filesystem/WatcherThread.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherThread.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import java.io.IOException;
 import java.nio.file.FileSystems;
@@ -29,8 +29,8 @@ import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/onap/pnfsimulator/logging/MdcVariables.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/logging/MdcVariables.java
index 4feb168..eb41df5 100644
--- a/src/main/java/org/onap/pnfsimulator/logging/MdcVariables.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/logging/MdcVariables.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.logging;
+package org.onap.integration.simulators.nfsimulator.vesclient.logging;
 
 public final class MdcVariables {
 
diff --git a/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorController.java
index f2c70dd..d9aebe3 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorController.java
@@ -18,20 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonSyntaxException;
 import org.json.JSONException;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.rest.util.DateUtil;
-import org.onap.pnfsimulator.rest.util.ResponseBuilder;
-import org.onap.pnfsimulator.simulator.SimulatorService;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
+import org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.SimulatorService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.DateUtil;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder;
 import org.quartz.SchedulerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,15 +61,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import static org.onap.pnfsimulator.logging.MdcVariables.INSTANCE_UUID;
-import static org.onap.pnfsimulator.logging.MdcVariables.INVOCATION_ID;
-import static org.onap.pnfsimulator.logging.MdcVariables.REQUEST_ID;
-import static org.onap.pnfsimulator.logging.MdcVariables.RESPONSE_CODE;
-import static org.onap.pnfsimulator.logging.MdcVariables.SERVICE_NAME;
-import static org.onap.pnfsimulator.logging.MdcVariables.X_INVOCATION_ID;
-import static org.onap.pnfsimulator.logging.MdcVariables.X_ONAP_REQUEST_ID;
-import static org.onap.pnfsimulator.rest.util.ResponseBuilder.MESSAGE;
-import static org.onap.pnfsimulator.rest.util.ResponseBuilder.TIMESTAMP;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder.MESSAGE;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.util.ResponseBuilder.TIMESTAMP;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
@@ -116,24 +110,24 @@ public class SimulatorController {
             return processRequest(triggerEventRequest);
 
         } catch (JSONException | JsonSyntaxException e) {
-            MDC.put(RESPONSE_CODE, BAD_REQUEST.toString());
+            MDC.put(MdcVariables.RESPONSE_CODE, BAD_REQUEST.toString());
             LOGGER.warn("Cannot trigger event, invalid json format: {}", e.getMessage());
             LOGGER.debug("Received json has invalid format", e);
             return buildResponse(BAD_REQUEST, ImmutableMap.of(MESSAGE, String
                 .format(INCORRECT_TEMPLATE_MESSAGE, triggerEventRequest.getTemplateName(),
                     e.getMessage())));
         } catch (GeneralSecurityException e) {
-            MDC.put(RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString());
+            MDC.put(MdcVariables.RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString());
             LOGGER.error("Client certificate validation failed: {}", e.getMessage());
             return buildResponse(INTERNAL_SERVER_ERROR,
                 ImmutableMap.of(MESSAGE, "Invalid or misconfigured client certificate"));
         } catch (IOException e) {
-            MDC.put(RESPONSE_CODE, BAD_REQUEST.toString());
+            MDC.put(MdcVariables.RESPONSE_CODE, BAD_REQUEST.toString());
             LOGGER.warn("Json validation failed: {}", e.getMessage());
             return buildResponse(BAD_REQUEST,
                 ImmutableMap.of(MESSAGE, String.format(NOT_EXISTING_TEMPLATE, triggerEventRequest.getTemplateName())));
         } catch (Exception e) {
-            MDC.put(RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString());
+            MDC.put(MdcVariables.RESPONSE_CODE, INTERNAL_SERVER_ERROR.toString());
             LOGGER.error("Cannot trigger event - unexpected exception", e);
             return buildResponse(INTERNAL_SERVER_ERROR,
                 ImmutableMap.of(MESSAGE, "Unexpected exception: " + e.getMessage()));
@@ -201,7 +195,7 @@ public class SimulatorController {
         throws IOException, SchedulerException, GeneralSecurityException {
 
         String jobName = simulatorService.triggerEvent(triggerEventRequest);
-        MDC.put(RESPONSE_CODE, OK.toString());
+        MDC.put(MdcVariables.RESPONSE_CODE, OK.toString());
         return buildResponse(OK, ImmutableMap.of(MESSAGE, "Request started", "jobName", jobName));
     }
 
@@ -225,10 +219,10 @@ public class SimulatorController {
     }
 
     private void logContextHeaders(HttpHeaders headers, String serviceName) {
-        MDC.put(REQUEST_ID, headers.getFirst(X_ONAP_REQUEST_ID));
-        MDC.put(INVOCATION_ID, headers.getFirst(X_INVOCATION_ID));
-        MDC.put(INSTANCE_UUID, UUID.randomUUID().toString());
-        MDC.put(SERVICE_NAME, serviceName);
+        MDC.put(MdcVariables.REQUEST_ID, headers.getFirst(MdcVariables.X_ONAP_REQUEST_ID));
+        MDC.put(MdcVariables.INVOCATION_ID, headers.getFirst(MdcVariables.X_INVOCATION_ID));
+        MDC.put(MdcVariables.INSTANCE_UUID, UUID.randomUUID().toString());
+        MDC.put(MdcVariables.SERVICE_NAME, serviceName);
     }
 
     private ResponseEntity<Map<String, Object>> createCancelEventResponse(boolean isCancelled) {
diff --git a/src/main/java/org/onap/pnfsimulator/rest/TemplateController.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateController.java
index 8f8fee7..120b24d 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/TemplateController.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateController.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import java.time.Instant;
 import java.util.List;
@@ -26,11 +26,11 @@ import java.util.Optional;
 import javax.validation.Valid;
 
 import com.google.gson.Gson;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.rest.model.TemplateRequest;
-import org.onap.pnfsimulator.rest.model.SearchExp;
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.TemplateRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SearchExp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/FullEvent.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/FullEvent.java
index 77d9b3d..7ed1fb5 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/model/FullEvent.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/FullEvent.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.model;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.gson.JsonObject;
@@ -27,7 +27,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer;
 import org.springframework.lang.Nullable;
 
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SearchExp.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SearchExp.java
index 41d112f..1ff57da 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/model/SearchExp.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SearchExp.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.model;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.gson.JsonObject;
@@ -26,7 +26,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorParams.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorParams.java
index 787583e..20b695e 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorParams.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorParams.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.model;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.model;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorRequest.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorRequest.java
index d00b311..167c479 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/model/SimulatorRequest.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/SimulatorRequest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.model;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.gson.JsonObject;
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.pnfsimulator.rest.util.JsonObjectDeserializer;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.util.JsonObjectDeserializer;
 import org.springframework.lang.Nullable;
 
 @Getter
diff --git a/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/TemplateRequest.java
index f1e0243..3c66b23 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/model/TemplateRequest.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/model/TemplateRequest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.model;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtil.java
index 9a5c9ca..5afea02 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtil.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import java.text.DateFormat;
 import java.util.Date;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/JsonObjectDeserializer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/JsonObjectDeserializer.java
index f89c4a7..aba1e5b 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/util/JsonObjectDeserializer.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/JsonObjectDeserializer.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;
diff --git a/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilder.java
index 1fdd7cf..5f0c809 100644
--- a/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/DbTemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReader.java
index 878591b..4175a1c 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/DbTemplateReader.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReader.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -26,8 +26,8 @@ import com.google.gson.JsonObject;
 
 import java.io.IOException;
 
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.TemplateService;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/EventNotFoundException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/EventNotFoundException.java
index 01f6508..45bb630 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/EventNotFoundException.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/EventNotFoundException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 public class EventNotFoundException extends RuntimeException {
     private static final String NOT_FOUND = "Not found an event with id: ";
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/FilesystemTemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/FilesystemTemplateReader.java
index a405a2e..699e570 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/FilesystemTemplateReader.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/FilesystemTemplateReader.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProvider.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProvider.java
index 4a7cf02..e304795 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProvider.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProvider.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 @FunctionalInterface
 public interface IncrementProvider {
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProviderImpl.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImpl.java
index 9d4d3ec..92ebbd1 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/IncrementProviderImpl.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImpl.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataRepository;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/JsonTokenProcessor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/JsonTokenProcessor.java
index da0026a..25399e7 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/JsonTokenProcessor.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/JsonTokenProcessor.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsExtractor.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractor.java
index 2dc52a1..3d6b5d6 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsExtractor.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractor.java
@@ -17,27 +17,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static io.vavr.API.$;
 import static io.vavr.API.Case;
 import static io.vavr.API.Match;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getEpochSecond;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomLimitedInteger;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomInteger;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomLimitedString;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomString;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getRandomPrimitiveInteger;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.getTimestampPrimitive;
-import static org.onap.pnfsimulator.simulator.keywords.NonParameterKeywordPatterns.$nonParameterKeyword;
-import static org.onap.pnfsimulator.simulator.keywords.SingleParameterKeywordPatterns.$singleParameterKeyword;
-import static org.onap.pnfsimulator.simulator.keywords.TwoParameterKeywordPatterns.$twoParameterKeyword;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.NonParameterKeywordPatterns.$nonParameterKeyword;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.SingleParameterKeywordPatterns.$singleParameterKeyword;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.TwoParameterKeywordPatterns.$twoParameterKeyword;
 
 import io.vavr.API.Match.Pattern1;
-import org.onap.pnfsimulator.simulator.keywords.Keyword;
-import org.onap.pnfsimulator.simulator.keywords.NonParameterKeyword;
-import org.onap.pnfsimulator.simulator.keywords.SingleParameterKeyword;
-import org.onap.pnfsimulator.simulator.keywords.TwoParameterKeyword;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.Keyword;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.NonParameterKeyword;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.SingleParameterKeyword;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords.TwoParameterKeyword;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -46,26 +39,26 @@ public class KeywordsExtractor {
     String substituteStringKeyword(String text, int increment) {
         return Match(text).of(
             Case(isRandomStringParamKeyword(),
-                spk -> spk.substituteKeyword(getRandomString().apply(spk.getAdditionalParameter()))
+                spk -> spk.substituteKeyword(KeywordsValueProvider.getRandomString().apply(spk.getAdditionalParameter()))
             ),
             Case(isRandomStringNonParamKeyword(),
-                npk -> npk.substituteKeyword(getRandomLimitedString().apply())
+                npk -> npk.substituteKeyword(KeywordsValueProvider.getRandomLimitedString().apply())
             ),
             Case(isRandomIntegerParamKeyword(),
-                tpk -> tpk.substituteKeyword(getRandomInteger().apply(
+                tpk -> tpk.substituteKeyword(KeywordsValueProvider.getRandomInteger().apply(
                     tpk.getAdditionalParameter1(),
                     tpk.getAdditionalParameter2()
                     )
                 )
             ),
             Case(isRandomIntegerNonParamKeyword(),
-                npk -> npk.substituteKeyword(getRandomLimitedInteger().apply())
+                npk -> npk.substituteKeyword(KeywordsValueProvider.getRandomLimitedInteger().apply())
             ),
             Case(isIncrementKeyword(),
                 ik -> ik.substituteKeyword(String.valueOf(increment))
             ),
             Case(isTimestampNonParamKeyword(),
-                npk -> npk.substituteKeyword(getEpochSecond().apply())
+                npk -> npk.substituteKeyword(KeywordsValueProvider.getEpochSecond().apply())
             ),
             Case(
                 $(),
@@ -77,10 +70,10 @@ public class KeywordsExtractor {
         return Match(text).of(
             Case(isRandomPrimitiveIntegerParamKeyword(),
                 tpk ->
-                    getRandomPrimitiveInteger().apply(tpk.getAdditionalParameter1(), tpk.getAdditionalParameter2())),
+                    KeywordsValueProvider.getRandomPrimitiveInteger().apply(tpk.getAdditionalParameter1(), tpk.getAdditionalParameter2())),
             Case(isTimestampPrimitiveNonParamKeyword(),
                 tpk ->
-                    getTimestampPrimitive().apply()),
+                    KeywordsValueProvider.getTimestampPrimitive().apply()),
             Case(
                 $(),
                 () -> 0L
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandler.java
index ac80647..b37e21a 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandler.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandler.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerException.java
index 9685bc3..ff892e0 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsHandlerException.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerException.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 public class KeywordsHandlerException extends RuntimeException {
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsValueProvider.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProvider.java
index 3bcfa5b..5c46edd 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/KeywordsValueProvider.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProvider.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import io.vavr.Function0;
 import io.vavr.Function1;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/SimulatorService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorService.java
index 218dbc8..19685b6 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/SimulatorService.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorService.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.common.base.Strings;
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorParams;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
-import org.onap.pnfsimulator.simulator.scheduler.EventScheduler;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventScheduler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfigService;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplatePatcher.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcher.java
index 1114d3c..921eab6 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/TemplatePatcher.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcher.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReader.java
index 2471c08..25cc1e6 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/TemplateReader.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReader.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.JsonObject;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacer.java
index eb0b141..b441782 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacer.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacer.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactory.java
index 36ba922..d77d4c9 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactory.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapter.java
index 8cb6aa2..2f716c2 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 public interface HttpClientAdapter {
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImpl.java
index ba668fc..6cddc18 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImpl.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpHeaders;
@@ -27,8 +27,8 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.HttpClientFactoryFacade;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.HttpClientFactoryFacade;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -43,9 +43,9 @@ import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.util.UUID;
 
-import static org.onap.pnfsimulator.logging.MdcVariables.REQUEST_ID;
-import static org.onap.pnfsimulator.logging.MdcVariables.X_INVOCATION_ID;
-import static org.onap.pnfsimulator.logging.MdcVariables.X_ONAP_REQUEST_ID;
+import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.REQUEST_ID;
+import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.X_INVOCATION_ID;
+import static org.onap.integration.simulators.nfsimulator.vesclient.logging.MdcVariables.X_ONAP_REQUEST_ID;
 
 public class HttpClientAdapterImpl implements HttpClientAdapter {
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpResponseAdapter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpResponseAdapter.java
index e78b8a3..976a972 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/HttpResponseAdapter.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpResponseAdapter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 public class HttpResponseAdapter {
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactory.java
index 72af9e5..4257f9e 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactory.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertificateReader.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertificateReader.java
index a42114b..0d22d0e 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertificateReader.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertificateReader.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactory.java
index ca57a64..7237203 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactory.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import io.vavr.control.Try;
 import org.apache.http.client.HttpClient;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacade.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacade.java
index dffd635..2ed1ff9 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacade.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacade.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverter.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverter.java
index 7a645ae..b29963c 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverter.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverter.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactory.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactory.java
index b8dfe6f..e54b4c0 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactory.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactory.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslAuthenticationHelper.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SslAuthenticationHelper.java
index 271ad93..c72cb3c 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslAuthenticationHelper.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SslAuthenticationHelper.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/Keyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/Keyword.java
index 1bb1332..115ef85 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/Keyword.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/Keyword.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 import io.vavr.Function1;
 import io.vavr.Function2;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/NonParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/NonParameterKeyword.java
index 5e44550..f850f69 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/NonParameterKeyword.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/NonParameterKeyword.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 import io.vavr.Tuple;
 import io.vavr.Tuple1;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/SingleParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/SingleParameterKeyword.java
index b1c38c8..a4ea5b9 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/SingleParameterKeyword.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/SingleParameterKeyword.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 import io.vavr.Tuple;
 import io.vavr.Tuple1;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeyword.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeyword.java
index 6fecfa6..f1f1a76 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeyword.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeyword.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 import io.vavr.Tuple;
 import io.vavr.Tuple1;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventJob.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJob.java
index a467370..cf3a514 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventJob.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJob.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.simulator.KeywordsHandler;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventScheduler.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventScheduler.java
index 5584cb1..5c69d9d 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/EventScheduler.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventScheduler.java
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.simulator.KeywordsHandler;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapterImpl;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapterImpl;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.quartz.JobBuilder;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
@@ -42,12 +42,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.BODY;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.CLIENT_ADAPTER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.EVENT_ID;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.KEYWORDS_HANDLER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.TEMPLATE_NAME;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.VES_URL;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.BODY;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.CLIENT_ADAPTER;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.EVENT_ID;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.KEYWORDS_HANDLER;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.TEMPLATE_NAME;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventJob.VES_URL;
 import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
 
 @Component
diff --git a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/QuartzConfiguration.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/QuartzConfiguration.java
index 2beb9dc..882c1a1 100644
--- a/src/main/java/org/onap/pnfsimulator/simulator/scheduler/QuartzConfiguration.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/QuartzConfiguration.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfig.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfig.java
index 0baa477..8b0588c 100644
--- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfig.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfig.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulatorconfig;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigRepository.java
index 5e63ee4..c1ec882 100644
--- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigRepository.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigRepository.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulatorconfig;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
diff --git a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigService.java
index 2063351..af6dd26 100644
--- a/src/main/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigService.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulatorconfig;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizer.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizer.java
index 0080813..9eeb570 100644
--- a/src/main/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizer.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizer.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import org.bson.json.JsonParseException;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.filesystem.WatcherEventProcessor;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.filesystem.WatcherEventProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/pnfsimulator/template/Template.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/Template.java
index 121d7d4..0aeca40 100644
--- a/src/main/java/org/onap/pnfsimulator/template/Template.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/Template.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.pnfsimulator.db.Row;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Row;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.JsonUtils;
 import org.bson.Document;
-import org.onap.pnfsimulator.template.search.JsonUtils;
 import org.springframework.data.mongodb.core.mapping.Field;
 
 @NoArgsConstructor
diff --git a/src/main/java/org/onap/pnfsimulator/template/TemplateRepository.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateRepository.java
index 78c9c77..6b3bcd4 100644
--- a/src/main/java/org/onap/pnfsimulator/template/TemplateRepository.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateRepository.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
diff --git a/src/main/java/org/onap/pnfsimulator/template/TemplateService.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateService.java
index 3e245e1..2b3fbbd 100644
--- a/src/main/java/org/onap/pnfsimulator/template/TemplateService.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateService.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.search.TemplateSearchHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.TemplateSearchHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/IllegalJsonValueException.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/IllegalJsonValueException.java
index 1685536..d2c1c2a 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/IllegalJsonValueException.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/IllegalJsonValueException.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 public class IllegalJsonValueException extends IllegalArgumentException {
 
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/JsonUtils.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtils.java
index b595b4f..3d7c60d 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/JsonUtils.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/TemplateSearchHelper.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelper.java
index 3f22b1a..432b2d6 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/TemplateSearchHelper.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelper.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.template.search.handler.PrimitiveValueCriteriaBuilder;
-import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler.PrimitiveValueCriteriaBuilder;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilder.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilder.java
index 79d64b7..7e5ae02 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilder.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search.handler;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler;
 
 import com.google.common.collect.Lists;
 import com.google.gson.JsonPrimitive;
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/FlatTemplateContent.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/FlatTemplateContent.java
index 8634052..9c9a39d 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/FlatTemplateContent.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/FlatTemplateContent.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search.viewmodel;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel;
 
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.pnfsimulator.db.Row;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Row;
 
 import java.util.List;
 
diff --git a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/KeyValuePair.java b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/KeyValuePair.java
index 8f24334..9c9ca72 100644
--- a/src/main/java/org/onap/pnfsimulator/template/search/viewmodel/KeyValuePair.java
+++ b/src/main/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/viewmodel/KeyValuePair.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search.viewmodel;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/test/java/org/onap/pnfsimulator/event/EventDataServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java
index 5ed51cc..637c658 100644
--- a/src/test/java/org/onap/pnfsimulator/event/EventDataServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/event/EventDataServiceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.event;
+package org.onap.integration.simulators.nfsimulator.vesclient.event;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java
index b86a0f9..b4534bf 100644
--- a/src/test/java/org/onap/pnfsimulator/filesystem/InMemoryTemplateStorage.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/InMemoryTemplateStorage.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import com.google.gson.JsonObject;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 
 public class InMemoryTemplateStorage implements Storage<Template> {
 
diff --git a/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessorTest.java
index 9dfa002..e88715a 100644
--- a/src/test/java/org/onap/pnfsimulator/filesystem/WatcherEventProcessorTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/filesystem/WatcherEventProcessorTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.filesystem;
+package org.onap.integration.simulators.nfsimulator.vesclient.filesystem;
 
 import static junit.framework.TestCase.fail;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -39,8 +39,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 
 class WatcherEventProcessorTest {
 
@@ -54,7 +54,7 @@ class WatcherEventProcessorTest {
 
     @BeforeAll
     static void init() {
-        jsonFilePath = Paths.get("src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json");
+        jsonFilePath = Paths.get("src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json");
     }
 
     @BeforeEach
diff --git a/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorControllerTest.java
index 8dba750..2f13cec 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/SimulatorControllerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
@@ -30,14 +30,14 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorParams;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.simulator.SimulatorService;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.SimulatorService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
 import org.quartz.SchedulerException;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateControllerTest.java
index 17be475..0f468b9 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/TemplateControllerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/TemplateControllerTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.pnfsimulator.rest.TemplateController.CANNOT_OVERRIDE_TEMPLATE_MSG;
-import static org.onap.pnfsimulator.rest.TemplateController.TEMPLATE_NOT_FOUND_MSG;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.TemplateController.CANNOT_OVERRIDE_TEMPLATE_MSG;
+import static org.onap.integration.simulators.nfsimulator.vesclient.rest.TemplateController.TEMPLATE_NOT_FOUND_MSG;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -53,10 +53,10 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.db.Storage;
-import org.onap.pnfsimulator.rest.model.SearchExp;
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.IllegalJsonValueException;
+import org.onap.integration.simulators.nfsimulator.vesclient.db.Storage;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SearchExp;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
diff --git a/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtilTest.java
index 1591a59..f9bf3ef 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/DateUtilTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilderTest.java
index 4e8e4dc..36d6c20 100644
--- a/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/rest/util/ResponseBuilderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.rest.util;
+package org.onap.integration.simulators.nfsimulator.vesclient.rest.util;
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReaderTest.java
index c3f85f5..cc03d8a 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/DbTemplateReaderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/DbTemplateReaderTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -25,8 +25,8 @@ import org.assertj.core.api.Assertions;
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.onap.pnfsimulator.template.Template;
-import org.onap.pnfsimulator.template.TemplateService;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.Template;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.TemplateService;
 
 import java.io.IOException;
 import java.util.Optional;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImplTest.java
index b5304a7..d57b653 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/IncrementProviderImplTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/IncrementProviderImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -32,8 +32,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataRepository;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataRepository;
 
 public class IncrementProviderImplTest {
     private IncrementProvider incrementProvider;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
index 8198e95..e6a1213 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomStringTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomStringTest.java
index 6834c0d..fad4ff9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidRandomStringTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidRandomStringTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidTimestampTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidTimestampTest.java
index eda4070..54a72a9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorInvalidTimestampTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorInvalidTimestampTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomIntegerTest.java
index be79488..5befed8 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
index 0843ad1..4747e4e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomPrimitiveIntegerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomStringTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomStringTest.java
index f0fdc0f..69d603c 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidRandomStringTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidRandomStringTest.java
@@ -18,10 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,8 +37,8 @@ public class KeywordsExtractorValidRandomStringTest {
     private KeywordsExtractor keywordsExtractor;
 
     private static final Collection VALID_STRING_KEYWORDS = Arrays.asList(new Object[][]{
-        {"#RandomString", DEFAULT_STRING_LENGTH},
-        {"1#RandomString2", 1 + DEFAULT_STRING_LENGTH + 1},
+        {"#RandomString", KeywordsValueProvider.DEFAULT_STRING_LENGTH},
+        {"1#RandomString2", 1 + KeywordsValueProvider.DEFAULT_STRING_LENGTH + 1},
         {"#RandomString(23)", 23},
         {"#RandomString(11)12", 11 + 2},
         {"1#RandomString(11)", 1 + 11},
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
index 7743e55..af5fd8e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampPrimitiveTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampTest.java
index bf6f290..11c709b 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsExtractorValidTimestampTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsExtractorValidTimestampTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerTest.java
index e36bb28..09bb46f 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsHandlerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsHandlerTest.java
@@ -18,10 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -166,7 +165,7 @@ class KeywordsHandlerTest {
                 .get("domain").getAsString();
 
         assertThat(extraFields.length()).isEqualTo(4);
-        assertThat(newDomain.length()).isEqualTo(DEFAULT_STRING_LENGTH);
+        assertThat(newDomain.length()).isEqualTo(KeywordsValueProvider.DEFAULT_STRING_LENGTH);
     }
 
     @Test
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProviderTest.java
index ac54237..43d6b73 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/KeywordsValueProviderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/KeywordsValueProviderTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.onap.pnfsimulator.simulator.KeywordsValueProvider.DEFAULT_STRING_LENGTH;
 
 import java.util.Random;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
@@ -34,7 +34,7 @@ class KeywordsValueProviderTest {
     @RepeatedTest(10)
     void randomLimitedStringTest() {
         String supplierResult = KeywordsValueProvider.getRandomLimitedString().apply();
-        assertEquals(DEFAULT_STRING_LENGTH, supplierResult.length());
+        Assertions.assertEquals(KeywordsValueProvider.DEFAULT_STRING_LENGTH, supplierResult.length());
     }
 
     @RepeatedTest(10)
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorServiceTest.java
index d5426ec..4580714 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/SimulatorServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/SimulatorServiceTest.java
@@ -18,28 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.event.EventData;
-import org.onap.pnfsimulator.event.EventDataService;
-import org.onap.pnfsimulator.rest.model.FullEvent;
-import org.onap.pnfsimulator.rest.model.SimulatorParams;
-import org.onap.pnfsimulator.rest.model.SimulatorRequest;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpResponseAdapter;
-import org.onap.pnfsimulator.simulator.client.HttpTestUtils;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
-import org.onap.pnfsimulator.simulator.scheduler.EventScheduler;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfig;
-import org.onap.pnfsimulator.simulatorconfig.SimulatorConfigService;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.FullEvent;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorParams;
+import org.onap.integration.simulators.nfsimulator.vesclient.rest.model.SimulatorRequest;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpResponseAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler.EventScheduler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfig;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig.SimulatorConfigService;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventData;
+import org.onap.integration.simulators.nfsimulator.vesclient.event.EventDataService;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils;
 import org.quartz.SchedulerException;
 
 import java.io.IOException;
@@ -102,7 +103,7 @@ class SimulatorServiceTest {
     private final SslAuthenticationHelper sslAuthenticationHelper = new SslAuthenticationHelper();
     private final TemplatePatcher templatePatcher = new TemplatePatcher();
     private final TemplateReader templateReader = new FilesystemTemplateReader(
-        "src/test/resources/org/onap/pnfsimulator/simulator/", GSON);
+        "src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/", GSON);
 
     private SimulatorService simulatorService;
     private EventDataService eventDataService;
@@ -234,7 +235,7 @@ class SimulatorServiceTest {
 
         when(simulatorConfigService.getConfiguration()).thenReturn(simulatorConfig);
 
-        assertEquals(simulatorService.getConfiguration(), simulatorConfig);
+        Assertions.assertEquals(simulatorService.getConfiguration(), simulatorConfig);
     }
 
     @Test
@@ -243,7 +244,7 @@ class SimulatorServiceTest {
 
         when(simulatorConfigService.updateConfiguration(simulatorConfig)).thenReturn(simulatorConfig);
 
-        assertEquals(simulatorService.updateConfiguration(simulatorConfig), simulatorConfig);
+        Assertions.assertEquals(simulatorService.updateConfiguration(simulatorConfig), simulatorConfig);
     }
 
     @Test
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcherTest.java
index 818c8be..13179aa 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplatePatcherTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplatePatcherTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplateReaderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReaderTest.java
index f029fce..d25df49 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplateReaderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateReaderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 @TestPropertySource
 class TemplateReaderTest {
 
-    private FilesystemTemplateReader templateReader = new FilesystemTemplateReader("src/test/resources/org/onap/pnfsimulator/simulator/", new Gson());
+    private FilesystemTemplateReader templateReader = new FilesystemTemplateReader("src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/", new Gson());
 
     @Test
     void testShouldReadJsonFromFile() throws IOException {
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacerTest.java
index 5b7e4f4..9bbc3e1 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/TemplateVariablesReplacerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/TemplateVariablesReplacerTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.simulator;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator;
 
 
 import com.google.gson.Gson;
@@ -171,4 +171,4 @@ class TemplateVariablesReplacerTest {
         JSONAssert.assertEquals(expectedAsString, result.toString(), true);
     }
 
-}
-\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactoryTest.java
index 2f8c6b3..136a7d9 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpApacheResponseAdapterFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpApacheResponseAdapterFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -31,8 +31,8 @@ import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createMockedHttpEntity;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createStatusLine;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createMockedHttpEntity;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createStatusLine;
 
 class HttpApacheResponseAdapterFactoryTest {
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImplTest.java
index cfbc8c1..34243b6 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpClientAdapterImplTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
@@ -33,7 +33,7 @@ import org.apache.tomcat.util.codec.binary.Base64;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -49,8 +49,8 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createMockedHttpEntity;
-import static org.onap.pnfsimulator.simulator.client.HttpTestUtils.createStatusLine;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createMockedHttpEntity;
+import static org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpTestUtils.createStatusLine;
 
 class HttpClientAdapterImplTest {
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpTestUtils.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpTestUtils.java
index 02ff531..5dc8d8c 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/HttpTestUtils.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/HttpTestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.ProtocolVersion;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
index c64ddd7..eac7384 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/CertAuthSslContextFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
@@ -138,4 +138,4 @@ public class CertAuthSslContextFactoryTest {
     private String getPath(String fileName) {
         return CERTIFICATES_DIRECTORY + fileName;
     }
-}
-\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
index e6d3d03..805b54a 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryFacadeTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryTest.java
index c213982..c5b447e 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/HttpClientFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/HttpClientFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverterTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverterTest.java
index fddfc5f..67a1599 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/PasswordConverterTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/PasswordConverterTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactoryTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactoryTest.java
index 85e40e5..cf22ebf 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SSLContextFactoryTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/client/utils/ssl/SSLContextFactoryTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.client.utils.ssl;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeywordTest.java
index 6477fbf..8e38738 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/keywords/TwoParameterKeywordTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/keywords/TwoParameterKeywordTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.keywords;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.keywords;
 
 
 import io.vavr.Tuple1;
@@ -45,4 +45,4 @@ class TwoParameterKeywordTest {
         assertEquals(twoParameterKeyword.getAdditionalParameter1(), expectedParam1);
         assertEquals(twoParameterKeyword.getAdditionalParameter2(), expectedParam2);
     }
-}
-\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJobTest.java
index fed6bb6..b452956 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventJobTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventJobTest.java
@@ -18,26 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.BODY;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.CLIENT_ADAPTER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.EVENT_ID;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.KEYWORDS_HANDLER;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.TEMPLATE_NAME;
-import static org.onap.pnfsimulator.simulator.scheduler.EventJob.VES_URL;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import org.onap.pnfsimulator.simulator.KeywordsExtractor;
-import org.onap.pnfsimulator.simulator.KeywordsHandler;
-import org.onap.pnfsimulator.simulator.client.HttpClientAdapter;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsExtractor;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.KeywordsHandler;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.HttpClientAdapter;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -73,12 +67,12 @@ class EventJobTest {
         JsonObject body, HttpClientAdapter clientAdapter) {
 
         JobDataMap jobDataMap = new JobDataMap();
-        jobDataMap.put(TEMPLATE_NAME, templateName);
-        jobDataMap.put(KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1));
-        jobDataMap.put(EVENT_ID, eventId);
-        jobDataMap.put(VES_URL, vesUrl);
-        jobDataMap.put(BODY, body);
-        jobDataMap.put(CLIENT_ADAPTER, clientAdapter);
+        jobDataMap.put(EventJob.TEMPLATE_NAME, templateName);
+        jobDataMap.put(EventJob.KEYWORDS_HANDLER, new KeywordsHandler(new KeywordsExtractor(), (id) -> 1));
+        jobDataMap.put(EventJob.EVENT_ID, eventId);
+        jobDataMap.put(EventJob.VES_URL, vesUrl);
+        jobDataMap.put(EventJob.BODY, body);
+        jobDataMap.put(EventJob.CLIENT_ADAPTER, clientAdapter);
 
         JobExecutionContext jobExecutionContext = mock(JobExecutionContext.class);
         JobDetail jobDetail = mock(JobDetail.class);
diff --git a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventSchedulerTest.java
index d7cabb7..88abeb5 100644
--- a/src/test/java/org/onap/pnfsimulator/simulator/scheduler/EventSchedulerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulator/scheduler/EventSchedulerTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulator.scheduler;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulator.scheduler;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,7 +38,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.onap.pnfsimulator.simulator.client.utils.ssl.SslAuthenticationHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.simulator.client.utils.ssl.SslAuthenticationHelper;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
@@ -54,7 +54,7 @@ class EventSchedulerTest {
 
     @Mock
     Scheduler quartzScheduler;
-    
+
     @Mock
     SslAuthenticationHelper sslAuthenticationHelper;
 
diff --git a/src/test/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigServiceTest.java
index 4ed0972..35eac53 100644
--- a/src/test/java/org/onap/pnfsimulator/simulatorconfig/SimulatorConfigServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/simulatorconfig/SimulatorConfigServiceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.simulatorconfig;
+package org.onap.integration.simulators.nfsimulator.vesclient.simulatorconfig;
 
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizerTest.java
index 2d65097..4f92558 100644
--- a/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/FsToDbTemplateSynchronizerTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -50,4 +50,4 @@ public class FsToDbTemplateSynchronizerTest {
         assertEquals(Level.ERROR, logsList.get(0)
                 .getLevel());
     }
-}
-\ No newline at end of file
+}
diff --git a/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateServiceTest.java
index fd41045..617e7b5 100644
--- a/src/test/java/org/onap/pnfsimulator/template/TemplateServiceTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/TemplateServiceTest.java
@@ -18,10 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template;
+package org.onap.integration.simulators.nfsimulator.vesclient.template;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import org.assertj.core.api.Assertions;
 import org.assertj.core.util.Lists;
 import org.bson.Document;
 import org.junit.Assert;
@@ -29,8 +30,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent;
-import org.onap.pnfsimulator.template.search.TemplateSearchHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.TemplateSearchHelper;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 
@@ -74,7 +75,7 @@ class TemplateServiceTest {
         when(templateRepositoryMock.findAll()).thenReturn(SAMPLE_TEMPLATE_LIST);
 
         List<Template> actual = service.getAll();
-        assertThat(actual).containsExactly(SAMPLE_TEMPLATE_LIST.get(0));
+        Assertions.assertThat(actual).containsExactly(SAMPLE_TEMPLATE_LIST.get(0));
     }
 
 
@@ -83,7 +84,7 @@ class TemplateServiceTest {
         when(templateRepositoryMock.findById("sample name")).thenReturn(Optional.of(SAMPLE_TEMPLATE));
 
         Optional<Template> actualTemplate = service.get("sample name");
-        assertThat(actualTemplate).isPresent();
+        Assertions.assertThat(actualTemplate).isPresent();
         assertThat(actualTemplate.get()).isEqualTo(SAMPLE_TEMPLATE);
     }
 
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtilsTest.java
index aac15a6..6690aa6 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/JsonUtilsTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/JsonUtilsTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelperTest.java
index 13ea7c6..01e06b1 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/TemplateSearchHelperTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/TemplateSearchHelperTest.java
@@ -18,11 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.mongodb.BasicDBList;
 import org.assertj.core.util.Lists;
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,7 +29,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.onap.pnfsimulator.template.search.viewmodel.FlatTemplateContent;
+import org.onap.integration.simulators.nfsimulator.vesclient.template.search.viewmodel.FlatTemplateContent;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
diff --git a/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
index 6de86e0..2626253 100644
--- a/src/test/java/org/onap/pnfsimulator/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
+++ b/src/test/java/org/onap/integration/simulators/nfsimulator/vesclient/template/search/handler/PrimitiveValueCriteriaBuilderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.pnfsimulator.template.search.handler;
+package org.onap.integration.simulators.nfsimulator.vesclient.template.search.handler;
 
 import com.google.gson.JsonPrimitive;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json
index 89e4a76..89e4a76 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/filesystem/test1.json
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/invalidJsonStructureEvent.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/invalidJsonStructureEvent.json
index 4d6ef7d..4d6ef7d 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/invalidJsonStructureEvent.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/invalidJsonStructureEvent.json
diff --git a/src/test/resources/org/onap/pnfsimulator/simulator/validExampleMeasurementEvent.json b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/validExampleMeasurementEvent.json
index a240b93..a240b93 100644
--- a/src/test/resources/org/onap/pnfsimulator/simulator/validExampleMeasurementEvent.json
+++ b/src/test/resources/org/onap/integration/simulators/nfsimulator/vesclient/simulator/validExampleMeasurementEvent.json
author	Bogumil Zebek <bogumil.zebek@nokia.com>	2021-03-10 12:55:08 +0100
committer	Zebek Bogumil <bogumil.zebek@nokia.com>	2021-03-10 12:55:08 +0100
commit	bae12bf7d5a92a4d6be22e9ce8c3dc9878c59f36 (patch)
tree	5cbb50a4c336d7ebee4c402f20f0e036a3bca814
parent	4af5241ab25b0103d8ea680789aaf9a8696dfc75 (diff)