From: vasraz <vasyl.razinkov@est.tech>
Date: Thu, 14 Nov 2019 11:24:56 +0000 (+0000)
Subject: Move jTosca contents to sdc-tosca
X-Git-Tag: 1.6.6~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=134bed676f01745969408d522ca9ac6c482ba549;p=sdc%2Fsdc-tosca.git

Move jTosca contents to sdc-tosca

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I5c47a8fd7d4ff295149d1d9b29aea71ae56cbcd4
Issue-ID: SDC-2457
---

diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 100644
index 833e1aa..0000000
--- a/docs/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-TODO Add files to toctree and delete this header
-------------------------------------------------
-.. toctree::
-   :maxdepth: 1
-
-
diff --git a/jtosca/.gitignore b/jtosca/.gitignore
new file mode 100644
index 0000000..59bfdd1
--- /dev/null
+++ b/jtosca/.gitignore
@@ -0,0 +1,20 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Maven
+log/
+target/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# Other
+*.class
+*.orig
+.idea/*
+/bin/
+*.iml
diff --git a/jtosca/pom.xml b/jtosca/pom.xml
index 8e02299..da019af 100644
--- a/jtosca/pom.xml
+++ b/jtosca/pom.xml
@@ -1,284 +1,201 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 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>
-
-	<groupId>org.onap.sdc.jtosca</groupId>
-	<artifactId>jtosca</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<name>sdc-jtosca</name>
-
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>2.0.0</version>
-		<relativePath/>
-	</parent>
-
-	<properties>
-
-		<!-- ==================== -->
-		<!-- Generic properties -->
-		<!-- ==================== -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- ==================== -->
-		<!-- Versions -->
-		<hamcrest.version>2.1</hamcrest.version>
-		<!-- ==================== -->
-		<!-- Global project version -->
-
-		<!-- Dependencies projects version -->
-		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
-		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
-		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
-		<sitePath>/content/sites/site/org/onap/sdc/jtosca/${project.version}</sitePath>
-		<snapshots.path>snapshots</snapshots.path>
-		<releases.path>releases</releases.path>
-		<!-- Sonar properties -->
-		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
-		<sonar.skipDesign>true</sonar.skipDesign>
-		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-		<sonar.sources>.</sonar.sources>
-		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
-		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
-		<sonar.branch>${project.version}</sonar.branch>
-
-	</properties>
-
-	<dependencies>
-		<!-- YAML parser -->
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-
-		<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version> <scope>test</scope> </dependency> -->
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest</artifactId>
-			<version>${hamcrest.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>${hamcrest.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.opencsv</groupId>
-			<artifactId>opencsv</artifactId>
-			<version>3.10</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
-			<exclusions>
-				<exclusion>  <!-- declare the exclusion here -->
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<scope>compile</scope>
-			<version>25.1-jre</version>
-		</dependency>
-
-	</dependencies>
-
-	<reporting>
-		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<configuration>
-					<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-					<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.4</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-webdav-jackrabbit</artifactId>
-						<version>2.10</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.8</version>
-				<executions>
-					<!-- Unit-Tests -->
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${sonar.jacoco.reportPath}</destFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
-				<configuration/>
-			</plugin>
-			<!-- Test -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<includes>
-						<include>*/*</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonarsource.scanner.maven</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.0.2</version>
-			</plugin>
-			<plugin>
-				<groupId>com.github.sylvainlaurent.maven</groupId>
-				<artifactId>yaml-json-validator-maven-plugin</artifactId>
-				<version>1.0.1</version>
-				<executions>
-					<execution>
-						<id>validate</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>validate</goal>
-						</goals>
-						<configuration>
-							<validationSets>
-								<validationSet>
-									<includes>
-										<include>src/main/resources/**/*.y*ml</include>
-										<include>src/test/resources/**/*.y*ml</include>
-									</includes>
-								</validationSet>
-								<validationSet>
-									<includes>
-										<include>src/main/resources/**/*.json</include>
-										<include>src/test/resources/**/*.json</include>
-									</includes>
-								</validationSet>
-							</validationSets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>Official Maven repository</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>onap-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>onap-snapshots</id>
-			<name>Snapshots Repository</name>
-			<url>${nexus.proxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>onap-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>
-		</repository>
-		<snapshotRepository>
-			<id>onap-snapshots</id>
-			<name>Snapshot Repository</name>
-			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
-		</snapshotRepository>
-		<site>
-			<id>onap-site</id>
-			<url>dav:${nexus.proxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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>
+
+  <artifactId>jtosca</artifactId>
+  <name>sdc-jtosca</name>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.onap.sdc.sdc-tosca</groupId>
+    <artifactId>sdc-tosca-jtosca</artifactId>
+    <version>1.6.5-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.reflections</groupId>
+      <artifactId>reflections</artifactId>
+      <version>0.9.11</version>
+    </dependency>
+
+    <!-- TEST -->
+    <dependency>
+      <groupId>com.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>3.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>${hamcrest.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>org.umlgraph</groupId>
+            <artifactId>umlgraph</artifactId>
+            <version>5.6</version>
+          </docletArtifact>
+          <additionalparam>-views</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+          <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.7.8</version>
+        <executions>
+          <!-- Unit-Tests -->
+          <execution>
+            <id>prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${sonar.jacoco.reportPath}</destFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
+        <configuration/>
+      </plugin>
+      <!-- Test -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <includes>
+            <include>*/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>3.0.2</version>
+      </plugin>
+      <plugin>
+        <groupId>com.github.sylvainlaurent.maven</groupId>
+        <artifactId>yaml-json-validator-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <configuration>
+              <validationSets>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.y*ml</include>
+                    <include>src/test/resources/**/*.y*ml</include>
+                  </includes>
+                </validationSet>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.json</include>
+                    <include>src/test/resources/**/*.json</include>
+                  </includes>
+                </validationSet>
+              </validationSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>central</id>
+      <name>Official Maven repository</name>
+      <url>http://repo2.maven.org/maven2/</url>
+    </repository>
+    <repository>
+      <id>onap-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>onap-snapshots</id>
+      <name>Snapshots Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <distributionManagement>
+    <repository>
+      <id>onap-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/${releases.path}/</url>
+    </repository>
+    <snapshotRepository>
+      <id>onap-snapshots</id>
+      <name>Snapshot Repository</name>
+      <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
+    </snapshotRepository>
+    <site>
+      <id>onap-site</id>
+      <url>dav:${nexus.proxy}${sitePath}</url>
+    </site>
+  </distributionManagement>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 0fa843e..18e8c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,327 +1,256 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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>
-	
-	<groupId>org.onap.sdc.sdc-tosca</groupId>
-	<artifactId>sdc-tosca</artifactId>
-	<name>sdc-sdc-tosca</name>
-	<description>SDC Tosca Parser JAR file for use by consumers</description>
-	<version>1.6.5-SNAPSHOT</version>
-	<packaging>jar</packaging>
+  <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>2.0.0</version>
-		<relativePath/>
-	</parent>
+  <groupId>org.onap.sdc.sdc-tosca</groupId>
+  <artifactId>sdc-tosca-jtosca</artifactId>
+  <name>sdc-tosca-jtosca</name>
+  <description>SDC Tosca Parser JAR file for use by consumers</description>
+  <version>1.6.5-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-	<properties>
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>2.0.0</version>
+    <relativePath/>
+  </parent>
 
-		<!-- ==================== -->
-		<!-- Generic properties -->
-		<!-- ==================== -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  <modules>
+    <module>sdc-tosca</module>
+    <module>jtosca</module>
+  </modules>
 
-		<!-- ==================== -->
-		<!-- Versions -->
-		<!-- ==================== -->
-		<!-- Global project version -->
+  <properties>
 
-		<!-- Dependencies projects version -->
-		<!--<sonar.skipDesign>true</sonar.skipDesign>-->
-		<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
-		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
-		<sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
-		<snapshots.path>snapshots</snapshots.path>
-		<releases.path>releases</releases.path>
-		<!-- Sonar properties -->
-		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
-		<sonar.skipDesign>true</sonar.skipDesign>
-		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
-		<sonar.sources>.</sonar.sources>
-		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
-		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
-		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
-		<sonar.branch>${project.version}</sonar.branch>
+    <!-- ==================== -->
+    <!-- Generic properties -->
+    <!-- ==================== -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-	</properties>
+    <!-- ==================== -->
+    <!-- Versions -->
+    <hamcrest.version>2.1</hamcrest.version>
+    <!-- ==================== -->
+    <!-- Global project version -->
 
-	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>compile</scope>
-			<version>1.7.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>test</scope>
-			<version>1.7.10</version>
-		</dependency>
+    <!-- Dependencies projects version -->
+    <!--<sonar.skipDesign>true</sonar.skipDesign>-->
+    <!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
+    <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
+    <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+    <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath>
+    <snapshots.path>snapshots</snapshots.path>
+    <releases.path>releases</releases.path>
+    <!-- Sonar properties -->
+    <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
+    <sonar.skipDesign>true</sonar.skipDesign>
+    <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
+    <sonar.sources>.</sonar.sources>
+    <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
+    <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+    <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java
+    </sonar.inclusions>
+    <sonar.branch>${project.version}</sonar.branch>
 
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
-			<scope>compile</scope>
-		</dependency>
+  </properties>
 
-		<dependency>
-			<groupId>org.functionaljava</groupId>
-			<artifactId>functionaljava</artifactId>
-			<version>4.2</version>
-			<scope>compile</scope>
-		</dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+    </dependency>
 
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.5</version>
-			<scope>compile</scope>
-		</dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
 
-		<!-- YAML parser -->
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
-			<scope>compile</scope>
-		</dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>compile</scope>
+      <version>25.1-jre</version>
+    </dependency>
 
-		<!-- Apache Commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
-			<scope>compile</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>21.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-		<dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-databind</artifactId>
-		    <version>2.9.9</version>
-		</dependency>
+    <!-- YAML parser -->
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.14</version>
+      <scope>compile</scope>
+    </dependency>
 
-		<!-- jtosca Tosca Parser -->
-		<dependency>
-			<groupId>org.onap.sdc.jtosca</groupId>
-			<artifactId>jtosca</artifactId>
-			<version>1.6.0</version>
-		</dependency>
+  </dependencies>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>org.umlgraph</groupId>
+            <artifactId>umlgraph</artifactId>
+            <version>5.6</version>
+          </docletArtifact>
+          <additionalparam>-views</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 
-		<!-- TEST -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<scope>test</scope>
-			<version>9.4.18.v20190429</version>
-		</dependency>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+          </dependency>
+        </dependencies>
+      </plugin>
 
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>9.4.18.v20190429</version>
-			<scope>test</scope>
-		</dependency>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+          <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+        </configuration>
+      </plugin>
 
-
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.11</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-	
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.4</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-webdav-jackrabbit</artifactId>
-						<version>2.10</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
-				<configuration>
-					<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-					<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.8</version>
-				<executions>
-					<!-- Unit-Tests -->
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.7.8</version>
+        <executions>
+          <!-- Unit-Tests -->
+          <execution>
+            <id>prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
-				<configuration />
-			</plugin>
-			<!-- Test -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<argLine>${argLine} -Xmx2048m</argLine>
-					<includes>
-						<include>**/ToscaParser***Test.class</include>
-					</includes>
-				</configuration>
-			</plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
+        <configuration/>
+      </plugin>
+      <!-- Test -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <argLine>${argLine} -Xmx2048m</argLine>
+          <includes>
+            <include>**/ToscaParser***Test.class</include>
+          </includes>
+        </configuration>
+      </plugin>
 
-			<plugin>
-				<groupId>org.sonarsource.scanner.maven</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.0.2</version>
-			</plugin>
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>3.0.2</version>
+      </plugin>
 
-			<plugin>
-				<groupId>com.github.sylvainlaurent.maven</groupId>
-				<artifactId>yaml-json-validator-maven-plugin</artifactId>
-				<version>1.0.1</version>
-				<executions>
-					<execution>
-						<id>validate</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>validate</goal>
-						</goals>
-						<configuration>
-							<validationSets>
-								<validationSet>
-									<includes>
-										<include>src/main/resources/**/*.y*ml</include>
-										<include>src/test/resources/**/*.y*ml</include>
-									</includes>
-								</validationSet>
-								<validationSet>
-									<includes>
-										<include>src/main/resources/**/*.json</include>
-										<include>src/test/resources/**/*.json</include>
-									</includes>
-								</validationSet>
-							</validationSets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+      <plugin>
+        <groupId>com.github.sylvainlaurent.maven</groupId>
+        <artifactId>yaml-json-validator-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <configuration>
+              <validationSets>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.y*ml</include>
+                    <include>src/test/resources/**/*.y*ml</include>
+                  </includes>
+                </validationSet>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.json</include>
+                    <include>src/test/resources/**/*.json</include>
+                  </includes>
+                </validationSet>
+              </validationSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>Official Maven repository</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>Snapshots Repository</name>
-			<url>${nexus.proxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
+  <repositories>
+    <repository>
+      <id>central</id>
+      <name>Official Maven repository</name>
+      <url>http://repo2.maven.org/maven2/</url>
+    </repository>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshots Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
 
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>Release Repository</name>
-			<url>${nexus.proxy}/content/repositories/${releases.path}/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>Snapshot Repository</name>
-			<url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexus.proxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
+  <distributionManagement>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/${releases.path}/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshot Repository</name>
+      <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
+    </snapshotRepository>
+    <site>
+      <id>ecomp-site</id>
+      <url>dav:${nexus.proxy}${sitePath}</url>
+    </site>
+  </distributionManagement>
 </project>
diff --git a/sdc-tosca/pom.xml b/sdc-tosca/pom.xml
new file mode 100644
index 0000000..6044090
--- /dev/null
+++ b/sdc-tosca/pom.xml
@@ -0,0 +1,220 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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>
+
+  <artifactId>sdc-tosca</artifactId>
+  <name>sdc-tosca</name>
+  <description>SDC Tosca Parser JAR file for use by consumers</description>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.onap.sdc.sdc-tosca</groupId>
+    <artifactId>sdc-tosca-jtosca</artifactId>
+    <version>1.6.5-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <!-- jtosca Tosca Parser -->
+    <dependency>
+      <groupId>org.onap.sdc.sdc-tosca</groupId>
+      <artifactId>jtosca</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.9</version>
+    </dependency>
+
+    <!-- Apache Commons -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- TEST -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.4</version>
+        <configuration>
+          <failOnError>false</failOnError>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>org.umlgraph</groupId>
+            <artifactId>umlgraph</artifactId>
+            <version>5.6</version>
+          </docletArtifact>
+          <additionalparam>-views</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+          <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.7.8</version>
+        <executions>
+          <!-- Unit-Tests -->
+          <execution>
+            <id>prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>target/jacoco.exec</destFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.10.3</version>
+        <configuration/>
+      </plugin>
+      <!-- Test -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <argLine>${argLine} -Xmx2048m</argLine>
+          <includes>
+            <include>**/ToscaParser***Test.class</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>3.0.2</version>
+      </plugin>
+
+      <plugin>
+        <groupId>com.github.sylvainlaurent.maven</groupId>
+        <artifactId>yaml-json-validator-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <configuration>
+              <validationSets>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.y*ml</include>
+                    <include>src/test/resources/**/*.y*ml</include>
+                  </includes>
+                </validationSet>
+                <validationSet>
+                  <includes>
+                    <include>src/main/resources/**/*.json</include>
+                    <include>src/test/resources/**/*.json</include>
+                  </includes>
+                </validationSet>
+              </validationSets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <repositories>
+    <repository>
+      <id>central</id>
+      <name>Official Maven repository</name>
+      <url>http://repo2.maven.org/maven2/</url>
+    </repository>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshots Repository</name>
+      <url>${nexus.proxy}/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <distributionManagement>
+    <repository>
+      <id>ecomp-releases</id>
+      <name>Release Repository</name>
+      <url>${nexus.proxy}/content/repositories/${releases.path}/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <name>Snapshot Repository</name>
+      <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url>
+    </snapshotRepository>
+    <site>
+      <id>ecomp-site</id>
+      <url>dav:${nexus.proxy}${sitePath}</url>
+    </site>
+  </distributionManagement>
+</project>
diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/Version.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/Version.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/api/Version.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/Version.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java
diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java
similarity index 100%
rename from src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java
rename to sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java
diff --git a/src/main/resources/config/configuration.yaml b/sdc-tosca/src/main/resources/config/configuration.yaml
similarity index 100%
rename from src/main/resources/config/configuration.yaml
rename to sdc-tosca/src/main/resources/config/configuration.yaml
diff --git a/src/main/resources/config/error-configuration.yaml b/sdc-tosca/src/main/resources/config/error-configuration.yaml
similarity index 100%
rename from src/main/resources/config/error-configuration.yaml
rename to sdc-tosca/src/main/resources/config/error-configuration.yaml
diff --git a/src/main/resources/config/jtosca-validation-issue-configuration.yaml b/sdc-tosca/src/main/resources/config/jtosca-validation-issue-configuration.yaml
similarity index 100%
rename from src/main/resources/config/jtosca-validation-issue-configuration.yaml
rename to sdc-tosca/src/main/resources/config/jtosca-validation-issue-configuration.yaml
diff --git a/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java
diff --git a/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java
diff --git a/src/test/java/org/onap/sdc/impl/GetEntityTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/GetEntityTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityTest.java
diff --git a/src/test/java/org/onap/sdc/impl/MyTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/MyTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/MyTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/MyTest.java
diff --git a/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java
diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java
diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java
diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java
diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java
diff --git a/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java
similarity index 100%
rename from src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java
rename to sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java
diff --git a/src/test/resources/config/configuration.yaml b/sdc-tosca/src/test/resources/config/configuration.yaml
similarity index 100%
rename from src/test/resources/config/configuration.yaml
rename to sdc-tosca/src/test/resources/config/configuration.yaml
diff --git a/src/test/resources/config/error-configuration-test.yaml b/sdc-tosca/src/test/resources/config/error-configuration-test.yaml
similarity index 100%
rename from src/test/resources/config/error-configuration-test.yaml
rename to sdc-tosca/src/test/resources/config/error-configuration-test.yaml
diff --git a/src/test/resources/config/error-configuration.yaml b/sdc-tosca/src/test/resources/config/error-configuration.yaml
similarity index 100%
rename from src/test/resources/config/error-configuration.yaml
rename to sdc-tosca/src/test/resources/config/error-configuration.yaml
diff --git a/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml
similarity index 100%
rename from src/test/resources/config/jtosca-validation-issue-configuration-test.yaml
rename to sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml
diff --git a/src/test/resources/config/jtosca-validation-issue-configuration.yaml b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration.yaml
similarity index 100%
rename from src/test/resources/config/jtosca-validation-issue-configuration.yaml
rename to sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration.yaml
diff --git a/src/test/resources/csars/csar-invalid-zip.zip b/sdc-tosca/src/test/resources/csars/csar-invalid-zip.zip
similarity index 100%
rename from src/test/resources/csars/csar-invalid-zip.zip
rename to sdc-tosca/src/test/resources/csars/csar-invalid-zip.zip
diff --git a/src/test/resources/csars/dataTypes-test-service.csar b/sdc-tosca/src/test/resources/csars/dataTypes-test-service.csar
similarity index 100%
rename from src/test/resources/csars/dataTypes-test-service.csar
rename to sdc-tosca/src/test/resources/csars/dataTypes-test-service.csar
diff --git a/src/test/resources/csars/resource-Policy-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Policy-csar.csar
similarity index 100%
rename from src/test/resources/csars/resource-Policy-csar.csar
rename to sdc-tosca/src/test/resources/csars/resource-Policy-csar.csar
diff --git a/src/test/resources/csars/resource-Sirovinputannotation-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Sirovinputannotation-csar.csar
similarity index 100%
rename from src/test/resources/csars/resource-Sirovinputannotation-csar.csar
rename to sdc-tosca/src/test/resources/csars/resource-Sirovinputannotation-csar.csar
diff --git a/src/test/resources/csars/resource-Vdbe-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Vdbe-csar.csar
similarity index 100%
rename from src/test/resources/csars/resource-Vdbe-csar.csar
rename to sdc-tosca/src/test/resources/csars/resource-Vdbe-csar.csar
diff --git a/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar b/sdc-tosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
diff --git a/src/test/resources/csars/service-AlService-csar.csar b/sdc-tosca/src/test/resources/csars/service-AlService-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-AlService-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-AlService-csar.csar
diff --git a/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar b/sdc-tosca/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-CgnatFwVnfNc-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar
diff --git a/src/test/resources/csars/service-CrTestService-csar.csar b/sdc-tosca/src/test/resources/csars/service-CrTestService-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-CrTestService-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-CrTestService-csar.csar
diff --git a/src/test/resources/csars/service-CxSvc-csar.csar b/sdc-tosca/src/test/resources/csars/service-CxSvc-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-CxSvc-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-CxSvc-csar.csar
diff --git a/src/test/resources/csars/service-Groupstest-csar.csar b/sdc-tosca/src/test/resources/csars/service-Groupstest-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-Groupstest-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-Groupstest-csar.csar
diff --git a/src/test/resources/csars/service-Ipassignservice-csar.csar b/sdc-tosca/src/test/resources/csars/service-Ipassignservice-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-Ipassignservice-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-Ipassignservice-csar.csar
diff --git a/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar b/sdc-tosca/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar
diff --git a/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar b/sdc-tosca/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar
diff --git a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar b/sdc-tosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
diff --git a/src/test/resources/csars/service-Nfod2images-csar.csar b/sdc-tosca/src/test/resources/csars/service-Nfod2images-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-Nfod2images-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-Nfod2images-csar.csar
diff --git a/src/test/resources/csars/service-NfodService-csar.csar b/sdc-tosca/src/test/resources/csars/service-NfodService-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-NfodService-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-NfodService-csar.csar
diff --git a/src/test/resources/csars/service-Oren1-csar-4.csar b/sdc-tosca/src/test/resources/csars/service-Oren1-csar-4.csar
similarity index 100%
rename from src/test/resources/csars/service-Oren1-csar-4.csar
rename to sdc-tosca/src/test/resources/csars/service-Oren1-csar-4.csar
diff --git a/src/test/resources/csars/service-PortMirroring.csar b/sdc-tosca/src/test/resources/csars/service-PortMirroring.csar
similarity index 100%
rename from src/test/resources/csars/service-PortMirroring.csar
rename to sdc-tosca/src/test/resources/csars/service-PortMirroring.csar
diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar
diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar
diff --git a/src/test/resources/csars/service-ServiceFdnt-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceFdnt-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar.csar
diff --git a/src/test/resources/csars/service-ServiceFdnt-test-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-test-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceFdnt-test-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceFdnt-test-csar.csar
diff --git a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceFdnt-with-get-input.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar
diff --git a/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar
diff --git a/src/test/resources/csars/service-Servicetosca9-csar.csar b/sdc-tosca/src/test/resources/csars/service-Servicetosca9-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-Servicetosca9-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-Servicetosca9-csar.csar
diff --git a/src/test/resources/csars/service-VdbePx-csar.csar b/sdc-tosca/src/test/resources/csars/service-VdbePx-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-VdbePx-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-VdbePx-csar.csar
diff --git a/src/test/resources/csars/service-VdbeSrv-csar.csar b/sdc-tosca/src/test/resources/csars/service-VdbeSrv-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-VdbeSrv-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-VdbeSrv-csar.csar
diff --git a/src/test/resources/csars/service-VlanD2dSrv-csar.csar b/sdc-tosca/src/test/resources/csars/service-VlanD2dSrv-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-VlanD2dSrv-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-VlanD2dSrv-csar.csar
diff --git a/src/test/resources/csars/service-consolidated-props-csar.csar b/sdc-tosca/src/test/resources/csars/service-consolidated-props-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-consolidated-props-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-consolidated-props-csar.csar
diff --git a/src/test/resources/csars/service-entry-definition-not-defined.csar b/sdc-tosca/src/test/resources/csars/service-entry-definition-not-defined.csar
similarity index 100%
rename from src/test/resources/csars/service-entry-definition-not-defined.csar
rename to sdc-tosca/src/test/resources/csars/service-entry-definition-not-defined.csar
diff --git a/src/test/resources/csars/service-invalid-conformence-level.csar b/sdc-tosca/src/test/resources/csars/service-invalid-conformence-level.csar
similarity index 100%
rename from src/test/resources/csars/service-invalid-conformence-level.csar
rename to sdc-tosca/src/test/resources/csars/service-invalid-conformence-level.csar
diff --git a/src/test/resources/csars/service-invalid-input-args.csar b/sdc-tosca/src/test/resources/csars/service-invalid-input-args.csar
similarity index 100%
rename from src/test/resources/csars/service-invalid-input-args.csar
rename to sdc-tosca/src/test/resources/csars/service-invalid-input-args.csar
diff --git a/src/test/resources/csars/service-invalid-yaml-content-meta.csar b/sdc-tosca/src/test/resources/csars/service-invalid-yaml-content-meta.csar
similarity index 100%
rename from src/test/resources/csars/service-invalid-yaml-content-meta.csar
rename to sdc-tosca/src/test/resources/csars/service-invalid-yaml-content-meta.csar
diff --git a/src/test/resources/csars/service-max-conformence-level.csar b/sdc-tosca/src/test/resources/csars/service-max-conformence-level.csar
similarity index 100%
rename from src/test/resources/csars/service-max-conformence-level.csar
rename to sdc-tosca/src/test/resources/csars/service-max-conformence-level.csar
diff --git a/src/test/resources/csars/service-missing-csar-meta-file.csar b/sdc-tosca/src/test/resources/csars/service-missing-csar-meta-file.csar
similarity index 100%
rename from src/test/resources/csars/service-missing-csar-meta-file.csar
rename to sdc-tosca/src/test/resources/csars/service-missing-csar-meta-file.csar
diff --git a/src/test/resources/csars/service-missing-entry-definition.csar b/sdc-tosca/src/test/resources/csars/service-missing-entry-definition.csar
similarity index 100%
rename from src/test/resources/csars/service-missing-entry-definition.csar
rename to sdc-tosca/src/test/resources/csars/service-missing-entry-definition.csar
diff --git a/src/test/resources/csars/service-missing-meta-file.csar b/sdc-tosca/src/test/resources/csars/service-missing-meta-file.csar
similarity index 100%
rename from src/test/resources/csars/service-missing-meta-file.csar
rename to sdc-tosca/src/test/resources/csars/service-missing-meta-file.csar
diff --git a/src/test/resources/csars/service-nested-vfc-csar.csar b/sdc-tosca/src/test/resources/csars/service-nested-vfc-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-nested-vfc-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-nested-vfc-csar.csar
diff --git a/src/test/resources/csars/service-resolve-get-input-csar.csar b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar.csar
similarity index 100%
rename from src/test/resources/csars/service-resolve-get-input-csar.csar
rename to sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar.csar
diff --git a/src/test/resources/csars/service-resolve-get-input-csar_QA.csar b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar_QA.csar
similarity index 100%
rename from src/test/resources/csars/service-resolve-get-input-csar_QA.csar
rename to sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar_QA.csar
diff --git a/src/test/resources/csars/service-sunny-flow.csar b/sdc-tosca/src/test/resources/csars/service-sunny-flow.csar
similarity index 100%
rename from src/test/resources/csars/service-sunny-flow.csar
rename to sdc-tosca/src/test/resources/csars/service-sunny-flow.csar
diff --git a/src/test/resources/csars/service-sunny-flow2.csar b/sdc-tosca/src/test/resources/csars/service-sunny-flow2.csar
similarity index 100%
rename from src/test/resources/csars/service-sunny-flow2.csar
rename to sdc-tosca/src/test/resources/csars/service-sunny-flow2.csar
diff --git a/src/test/resources/log4j.properties b/sdc-tosca/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/resources/log4j.properties
rename to sdc-tosca/src/test/resources/log4j.properties