75 files changed, 270 insertions, 273 deletions
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Capability.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java
index 17acdb0..09571db 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Capability.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Capability.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.elements.CapabilityTypeDef;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.elements.CapabilityTypeDef;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
+
 public class Capability {
 	
 	private String name;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/DataEntity.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java
index d288592..a5d0467 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/DataEntity.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java
@@ -1,16 +1,16 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.*;
-import org.openecomp.sdc.toscaparser.elements.constraints.Constraint;
-import org.openecomp.sdc.toscaparser.elements.constraints.Schema;
-import org.openecomp.sdc.toscaparser.functions.Function;
-import org.openecomp.sdc.toscaparser.utils.TOSCAVersionProperty;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.*;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Constraint;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Schema;
+import org.openecomp.sdc.toscaparser.api.functions.Function;
+import org.openecomp.sdc.toscaparser.api.utils.TOSCAVersionProperty;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
+
 public class DataEntity {
     // A complex data value entity
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/EntityTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java
index e735cd9..3d9c470 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/EntityTemplate.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/EntityTemplate.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.*;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.*;
+
 public abstract class EntityTemplate {
     // Base class for TOSCA templates
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Group.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java
index eb4ab04..58a3f87 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Group.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Group.java
@@ -1,13 +1,13 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
+
 public class Group extends EntityTemplate {
 	
 	private static final String TYPE = "type";
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ImportsLoader.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ImportsLoader.java
index e4f11fa..1ac334a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ImportsLoader.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ImportsLoader.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser;
+package org.openecomp.sdc.toscaparser.api;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.TypeValidation;
-import org.openecomp.sdc.toscaparser.utils.UrlUtils;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.TypeValidation;
+import org.openecomp.sdc.toscaparser.api.utils.UrlUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
@@ -470,8 +470,8 @@ from toscaparser.common.exception import UnknownFieldError
 from toscaparser.common.exception import ValidationError
 from toscaparser.elements.tosca_type_validation import TypeValidation
 from toscaparser.utils.gettextutils import _
-import org.openecomp.sdc.toscaparser.utils.urlutils
-import org.openecomp.sdc.toscaparser.utils.yamlparser
+import org.openecomp.sdc.toscaparser.api.utils.urlutils
+import org.openecomp.sdc.toscaparser.api.utils.yamlparser
 
 YAML_LOADER = toscaparser.utils.yamlparser.load_yaml
 log = logging.getLogger("tosca")
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/NodeTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java
index 1f2524a..2c9d981 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/NodeTemplate.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/NodeTemplate.java
@@ -1,13 +1,13 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.*;
-import org.openecomp.sdc.toscaparser.utils.CopyUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.*;
+import org.openecomp.sdc.toscaparser.api.utils.CopyUtils;
+
 public class NodeTemplate extends EntityTemplate {
 	
 	private LinkedHashMap<String,Object> templates;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Policy.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Policy.java
index 1c80ba8..1474d0b 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Policy.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Policy.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
+
 public class Policy extends EntityTemplate {
 	
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Property.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java
index a8017ed..731bc73 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Property.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Property.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.elements.constraints.Constraint;
-import org.openecomp.sdc.toscaparser.elements.constraints.Schema;
-import org.openecomp.sdc.toscaparser.functions.Function;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Constraint;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Schema;
+import org.openecomp.sdc.toscaparser.api.functions.Function;
+
 public class Property {
     // TOSCA built-in Property type
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/RelationshipTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/RelationshipTemplate.java
index fe44d50..10d3ad9 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/RelationshipTemplate.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/RelationshipTemplate.java
@@ -1,13 +1,13 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
-import org.openecomp.sdc.toscaparser.elements.StatefulEntityType;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
+import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
+
 public class RelationshipTemplate extends EntityTemplate {
 	
 	private static final String DERIVED_FROM = "derived_from";
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Repository.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Repository.java
index f730b2d..39699f3 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Repository.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Repository.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.UrlUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.UrlUtils;
+
 public class Repository {
 	
 	private static final String DESCRIPTION = "description";
@@ -78,7 +78,7 @@ from toscaparser.common.exception import MissingRequiredFieldError
 from toscaparser.common.exception import UnknownFieldError
 from toscaparser.common.exception import URLException
 from toscaparser.utils.gettextutils import _
-import org.openecomp.sdc.toscaparser.utils.urlutils
+import org.openecomp.sdc.toscaparser.api.utils.urlutils
 
 SECTIONS = (DESCRIPTION, URL, CREDENTIAL) = \
            ('description', 'url', 'credential')
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/SubstitutionMappings.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
index 56caf73..f02ec2a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/SubstitutionMappings.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/SubstitutionMappings.java
@@ -1,15 +1,15 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.NodeType;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
-import org.openecomp.sdc.toscaparser.parameters.Input;
-import org.openecomp.sdc.toscaparser.parameters.Output;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.NodeType;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.parameters.Output;
+
 
 public class SubstitutionMappings {
     // SubstitutionMappings class declaration
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/TopologyTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java
index 0726e49..bf1851c 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/TopologyTemplate.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/TopologyTemplate.java
@@ -1,22 +1,22 @@
-package org.openecomp.sdc.toscaparser;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.InterfacesDef;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.elements.NodeType;
-import org.openecomp.sdc.toscaparser.elements.RelationshipType;
-import org.openecomp.sdc.toscaparser.SubstitutionMappings;
-import org.openecomp.sdc.toscaparser.ToscaGraph;
-import org.openecomp.sdc.toscaparser.parameters.Input;
-import org.openecomp.sdc.toscaparser.parameters.Output;
-import org.openecomp.sdc.toscaparser.functions.Function;
-import org.openecomp.sdc.toscaparser.functions.GetAttribute;
-import org.openecomp.sdc.toscaparser.functions.GetInput;
+import org.openecomp.sdc.toscaparser.api.SubstitutionMappings;
+import org.openecomp.sdc.toscaparser.api.ToscaGraph;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.InterfacesDef;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.elements.NodeType;
+import org.openecomp.sdc.toscaparser.api.elements.RelationshipType;
+import org.openecomp.sdc.toscaparser.api.functions.Function;
+import org.openecomp.sdc.toscaparser.api.functions.GetAttribute;
+import org.openecomp.sdc.toscaparser.api.functions.GetInput;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.parameters.Output;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ToscaGraph.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaGraph.java
index 278cc4a..2de3bb9 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ToscaGraph.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaGraph.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.elements.RelationshipType;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.elements.RelationshipType;
+
 //import java.util.Iterator;
 
 public class ToscaGraph {
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ToscaTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java
index 25be141..8b7abce 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/ToscaTemplate.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java
@@ -1,13 +1,13 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.common.JToscaException;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.extensions.ExtTools;
-import org.openecomp.sdc.toscaparser.parameters.Input;
-import org.openecomp.sdc.toscaparser.parameters.Output;
-import org.openecomp.sdc.toscaparser.prereq.CSAR;
+package org.openecomp.sdc.toscaparser.api;
+
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.JToscaException;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.extensions.ExtTools;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.parameters.Output;
+import org.openecomp.sdc.toscaparser.api.prereq.CSAR;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
@@ -668,13 +668,13 @@ from toscaparser.common.exception import UnknownFieldError
 from toscaparser.common.exception import ValidationError
 from toscaparser.elements.entity_type import update_definitions
 from toscaparser.extensions.exttools import ExtTools
-import org.openecomp.sdc.toscaparser.imports
+import org.openecomp.sdc.toscaparser.api.imports
 from toscaparser.prereq.csar import CSAR
 from toscaparser.repositories import Repository
 from toscaparser.topology_template import TopologyTemplate
 from toscaparser.tpl_relationship_graph import ToscaGraph
 from toscaparser.utils.gettextutils import _
-import org.openecomp.sdc.toscaparser.utils.yamlparser
+import org.openecomp.sdc.toscaparser.api.utils.yamlparser
 
 
 # TOSCA template key names
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Triggers.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Triggers.java
index 09010a5..d753f4b 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/Triggers.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/Triggers.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+package org.openecomp.sdc.toscaparser.api;
 
 import java.util.LinkedHashMap;
 
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
+
 public class Triggers extends EntityTemplate {
 
 	private static final String DESCRIPTION = "description";
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/UnsupportedType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/UnsupportedType.java
index 6065156..318b3d3 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/UnsupportedType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/UnsupportedType.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.toscaparser;
+package org.openecomp.sdc.toscaparser.api;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class UnsupportedType {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/ExceptionCollector.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/ExceptionCollector.java
index 2a8bdd6..9bef6bc 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/ExceptionCollector.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/ExceptionCollector.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.toscaparser.common;
+package org.openecomp.sdc.toscaparser.api.common;
 
-import org.openecomp.sdc.toscaparser.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/JToscaException.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/JToscaException.java
index a83e5d7..0046aa1 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/JToscaException.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/JToscaException.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.common;
+package org.openecomp.sdc.toscaparser.api.common;
 
 public class JToscaException extends Exception {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/TOSCAException.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/TOSCAException.java
index 1ec8c2a..cfd7560 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/common/TOSCAException.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/common/TOSCAException.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.common;
+package org.openecomp.sdc.toscaparser.api.common;
 
 import java.util.IllegalFormatException;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ArtifactTypeDef.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ArtifactTypeDef.java
index fda1a3e..8a13d99 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ArtifactTypeDef.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ArtifactTypeDef.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/AttributeDef.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/AttributeDef.java
index 63c1d63..5551908 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/AttributeDef.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/AttributeDef.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/CapabilityTypeDef.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/CapabilityTypeDef.java
index 7ab3a9c..03e2c45 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/CapabilityTypeDef.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/CapabilityTypeDef.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
 
 public class CapabilityTypeDef extends StatefulEntityType {
 	// TOSCA built-in capabilities type
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/DataType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/DataType.java
index d8f8952..d5d770b 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/DataType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/DataType.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/EntityType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/EntityType.java
index 1ea5b42..650166d 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/EntityType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/EntityType.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -8,13 +8,12 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.openecomp.sdc.toscaparser.api.extensions.ExtTools;
+import org.openecomp.sdc.toscaparser.api.utils.CopyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
-import org.openecomp.sdc.toscaparser.extensions.ExtTools;
-import org.openecomp.sdc.toscaparser.utils.CopyUtils;
-
 public class EntityType {
 
 	private static Logger log = LoggerFactory.getLogger(EntityType.class.getName());
@@ -270,7 +269,7 @@ public class EntityType {
 from toscaparser.common.exception import ExceptionCollector
 from toscaparser.common.exception import ValidationError
 from toscaparser.extensions.exttools import ExtTools
-import org.openecomp.sdc.toscaparser.utils.yamlparser
+import org.openecomp.sdc.toscaparser.api.utils.yamlparser
 
 log = logging.getLogger('tosca')
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/GroupType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java
index 41dcd34..9a343b7 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/GroupType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/GroupType.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class GroupType extends StatefulEntityType {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/InterfacesDef.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/InterfacesDef.java
index c34bff8..c8c1518 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/InterfacesDef.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/InterfacesDef.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.EntityTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.EntityTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class InterfacesDef extends StatefulEntityType {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/Metadata.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/Metadata.java
index 8ffd019..4f7bdd0 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/Metadata.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/Metadata.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.Map;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/NodeType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java
index 7b103db..853b8ac 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/NodeType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.InterfacesDef;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.InterfacesDef;
 
 public class NodeType extends StatefulEntityType {
 	// TOSCA built-in node type
@@ -325,7 +325,7 @@ public class NodeType extends StatefulEntityType {
 from toscaparser.common.exception import ExceptionCollector
 from toscaparser.common.exception import UnknownFieldError
 from toscaparser.elements.capabilitytype import CapabilityTypeDef
-import org.openecomp.sdc.toscaparser.elements.interfaces as ifaces
+import org.openecomp.sdc.toscaparser.api.elements.interfaces as ifaces
 from toscaparser.elements.interfaces import InterfacesDef
 from toscaparser.elements.relationshiptype import RelationshipType
 from toscaparser.elements.statefulentitytype import StatefulEntityType
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PolicyType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PolicyType.java
index 942c021..d894b04 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PolicyType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PolicyType.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.TOSCAVersionProperty;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.TOSCAVersionProperty;
 
 public class PolicyType extends StatefulEntityType {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PortSpec.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PortSpec.java
index bae9488..dcb14f9 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PortSpec.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PortSpec.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.DataEntity;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+import org.openecomp.sdc.toscaparser.api.DataEntity;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
 
 public class PortSpec {
     // Parent class for tosca.datatypes.network.PortSpec type
@@ -87,7 +87,7 @@ public class PortSpec {
 from toscaparser.common.exception import ExceptionCollector
 from toscaparser.common.exception import InvalidTypeAdditionalRequirementsError
 from toscaparser.utils.gettextutils import _
-import org.openecomp.sdc.toscaparser.utils.validateutils as validateutils
+import org.openecomp.sdc.toscaparser.api.utils.validateutils as validateutils
 
 log = logging.getLogger('tosca')
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PropertyDef.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PropertyDef.java
index 15e554c..bbc1de1 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/PropertyDef.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/PropertyDef.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class PropertyDef {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/RelationshipType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/RelationshipType.java
index 2398ca3..15930ed 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/RelationshipType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/RelationshipType.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.StatefulEntityType;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
 
 public class RelationshipType extends StatefulEntityType {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnit.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java
index b8e27e4..1150e19 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnit.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.utils.ValidateUtils;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.utils.ValidateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitFrequency.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitFrequency.java
index 63d3f94..57a111e 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitFrequency.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitFrequency.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 public class ScalarUnitFrequency extends ScalarUnit {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitSize.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitSize.java
index e3028dc..72e7c33 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitSize.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitSize.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 public class ScalarUnitSize extends ScalarUnit {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitTime.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitTime.java
index b8c0ad0..5cde10a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/ScalarUnitTime.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnitTime.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 public class ScalarUnitTime extends ScalarUnit {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/StatefulEntityType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java
index 2ac42a1..04836ff 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/StatefulEntityType.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/StatefulEntityType.java
@@ -1,15 +1,14 @@
-package org.openecomp.sdc.toscaparser.elements;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.UnsupportedType;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
-import org.openecomp.sdc.toscaparser.elements.AttributeDef;
+import org.openecomp.sdc.toscaparser.api.UnsupportedType;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.AttributeDef;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
 
 
 public class StatefulEntityType extends EntityType {
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/TypeValidation.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/TypeValidation.java
index b29248d..c2d1a7c 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/TypeValidation.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/TypeValidation.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements;
+package org.openecomp.sdc.toscaparser.api.elements;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.extensions.ExtTools;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.extensions.ExtTools;
 
 public class TypeValidation {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Constraint.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java
index 43737bf..d82b76c 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Constraint.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Constraint.java
@@ -1,11 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.elements.ScalarUnit;
-
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.ScalarUnit;
 
 public abstract class Constraint {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Equal.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Equal.java
index dd88f02..e16cac3 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Equal.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Equal.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 public class Equal extends Constraint {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/GreaterOrEqual.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
index feb8fc0..168fd92 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/GreaterOrEqual.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.Date;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.functions.Function;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.functions.Function;
 
 public class GreaterOrEqual extends Constraint {
 	// Constraint class for "greater_or_equal"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/GreaterThan.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/GreaterThan.java
index cb5cf4e..2803bb4 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/GreaterThan.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/GreaterThan.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.Date;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class GreaterThan extends Constraint {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/InRange.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/InRange.java
index 9110e5c..6a5432c 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/InRange.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/InRange.java
@@ -1,9 +1,10 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.Date;
-import java.util.ArrayList;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+
+import java.util.ArrayList;
 
 public class InRange extends Constraint {
     // Constraint class for "in_range"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Length.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Length.java
index 9dd9ae9..939cb2a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Length.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Length.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class Length extends Constraint {
 	// Constraint class for "length"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/LessOrEqual.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/LessOrEqual.java
index 00a5ca1..f7778b6 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/LessOrEqual.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/LessOrEqual.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.Date;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class LessOrEqual extends Constraint {
 	// Constraint class for "less_or_equal"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/LessThan.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/LessThan.java
index 8ac74a0..2432e82 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/LessThan.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/LessThan.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.Date;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class LessThan extends Constraint {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/MaxLength.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/MaxLength.java
index 99292f2..d50fd1a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/MaxLength.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/MaxLength.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class MaxLength extends Constraint {
 	// Constraint class for "min_length"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/MinLength.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/MinLength.java
index 447572c..50fe7a1 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/MinLength.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/MinLength.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class MinLength extends Constraint {
 	// Constraint class for "min_length"
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Pattern.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Pattern.java
index f0c8c1d..2fa5a2f 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Pattern.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Pattern.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.regex.Matcher;
 import java.util.regex.PatternSyntaxException;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class Pattern extends Constraint {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Schema.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Schema.java
index 99580c5..c21bd7b 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/Schema.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/Schema.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 
 public class Schema {
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/ValidValues.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/ValidValues.java
index 61e9cc2..06622e4 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/elements/constraints/ValidValues.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/constraints/ValidValues.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.elements.constraints;
+package org.openecomp.sdc.toscaparser.api.elements.constraints;
 
 import java.util.ArrayList;
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/extensions/ExtTools.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/extensions/ExtTools.java
index 0aba75a..6403d6e 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/extensions/ExtTools.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/extensions/ExtTools.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.extensions;
+package org.openecomp.sdc.toscaparser.api.extensions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Concat.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Concat.java
index af69f86..9f29dd2 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Concat.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Concat.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class Concat extends Function {
     // Validate the function and provide an instance of the function
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Function.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Function.java
index 3a95090..102fbc0 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Function.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Function.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
 
 public abstract class Function {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetAttribute.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetAttribute.java
index 3a6db8a..5536dc5 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetAttribute.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetAttribute.java
@@ -1,23 +1,23 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.Capability;
-import org.openecomp.sdc.toscaparser.EntityTemplate;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.RelationshipTemplate;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.AttributeDef;
-import org.openecomp.sdc.toscaparser.elements.CapabilityTypeDef;
-import org.openecomp.sdc.toscaparser.elements.DataType;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.NodeType;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
-import org.openecomp.sdc.toscaparser.elements.RelationshipType;
-import org.openecomp.sdc.toscaparser.elements.StatefulEntityType;
-import org.openecomp.sdc.toscaparser.elements.constraints.Schema;
+import org.openecomp.sdc.toscaparser.api.Capability;
+import org.openecomp.sdc.toscaparser.api.EntityTemplate;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.RelationshipTemplate;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.AttributeDef;
+import org.openecomp.sdc.toscaparser.api.elements.CapabilityTypeDef;
+import org.openecomp.sdc.toscaparser.api.elements.DataType;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.NodeType;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
+import org.openecomp.sdc.toscaparser.api.elements.RelationshipType;
+import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Schema;
 
 public class GetAttribute extends Function {
 	// Get an attribute value of an entity defined in the service template
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetInput.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java
index 91eea5d..7970207 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetInput.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.DataEntity;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.DataEntity;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
 
 public class GetInput extends Function {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetOperationOutput.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetOperationOutput.java
index 2d736b2..f2231a1 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetOperationOutput.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetOperationOutput.java
@@ -1,15 +1,15 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 
-import org.openecomp.sdc.toscaparser.EntityTemplate;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.RelationshipTemplate;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.InterfacesDef;
-import org.openecomp.sdc.toscaparser.elements.RelationshipType;
-import org.openecomp.sdc.toscaparser.elements.StatefulEntityType;
+import org.openecomp.sdc.toscaparser.api.EntityTemplate;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.RelationshipTemplate;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.InterfacesDef;
+import org.openecomp.sdc.toscaparser.api.elements.RelationshipType;
+import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
 
 public class GetOperationOutput extends Function {
 
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetProperty.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetProperty.java
index 87600d8..e55250c 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/GetProperty.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetProperty.java
@@ -1,20 +1,20 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.Capability;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.Property;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.RelationshipTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.CapabilityTypeDef;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.NodeType;
-import org.openecomp.sdc.toscaparser.elements.PropertyDef;
-import org.openecomp.sdc.toscaparser.elements.RelationshipType;
-import org.openecomp.sdc.toscaparser.elements.StatefulEntityType;
+import org.openecomp.sdc.toscaparser.api.Capability;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.Property;
+import org.openecomp.sdc.toscaparser.api.RelationshipTemplate;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.CapabilityTypeDef;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.NodeType;
+import org.openecomp.sdc.toscaparser.api.elements.PropertyDef;
+import org.openecomp.sdc.toscaparser.api.elements.RelationshipType;
+import org.openecomp.sdc.toscaparser.api.elements.StatefulEntityType;
 
 public class GetProperty extends Function {
 	// Get a property value of an entity defined in the same service template
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Token.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Token.java
index 2bfadd0..e282d8a 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/functions/Token.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/functions/Token.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.functions;
+package org.openecomp.sdc.toscaparser.api.functions;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class Token extends Function {
     // Validate the function and provide an instance of the function
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/parameters/Input.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java
index a935030..bda15dc 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/parameters/Input.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Input.java
@@ -1,13 +1,13 @@
-package org.openecomp.sdc.toscaparser.parameters;
+package org.openecomp.sdc.toscaparser.api.parameters;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.DataEntity;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.EntityType;
-import org.openecomp.sdc.toscaparser.elements.constraints.Constraint;
-import org.openecomp.sdc.toscaparser.elements.constraints.Schema;
+import org.openecomp.sdc.toscaparser.api.DataEntity;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.EntityType;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Constraint;
+import org.openecomp.sdc.toscaparser.api.elements.constraints.Schema;
 
 public class Input {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/parameters/Output.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Output.java
index 9a05855..e987996 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/parameters/Output.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/parameters/Output.java
@@ -1,8 +1,8 @@
-package org.openecomp.sdc.toscaparser.parameters;
+package org.openecomp.sdc.toscaparser.api.parameters;
 
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class Output {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/prereq/CSAR.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/prereq/CSAR.java
index e6db212..159ad66 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/prereq/CSAR.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/prereq/CSAR.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.prereq;
+package org.openecomp.sdc.toscaparser.api.prereq;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -20,15 +20,14 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
+import org.openecomp.sdc.toscaparser.api.ImportsLoader;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.utils.UrlUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
-import org.openecomp.sdc.toscaparser.ImportsLoader;
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.utils.UrlUtils;
-
 public class CSAR {
 
 	private static Logger log = LoggerFactory.getLogger(CSAR.class.getName());
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/CopyUtils.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/CopyUtils.java
index f6e04f4..db236e1 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/CopyUtils.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/CopyUtils.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.utils;
+package org.openecomp.sdc.toscaparser.api.utils;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/DumpUtils.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/DumpUtils.java
index 060e811..32c69cd 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/DumpUtils.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/DumpUtils.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.toscaparser.utils;
+package org.openecomp.sdc.toscaparser.api.utils;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/TOSCAVersionProperty.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/TOSCAVersionProperty.java
index ceab796..7c6b62f 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/TOSCAVersionProperty.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/TOSCAVersionProperty.java
@@ -1,9 +1,9 @@
-package org.openecomp.sdc.toscaparser.utils;
+package org.openecomp.sdc.toscaparser.api.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class TOSCAVersionProperty {// test with functions/test_concat.yaml
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/UrlUtils.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/UrlUtils.java
index 1bf2f50..0aadcfe 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/UrlUtils.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/UrlUtils.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.toscaparser.utils;
+package org.openecomp.sdc.toscaparser.api.utils;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class UrlUtils {
 	
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/ValidateUtils.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/ValidateUtils.java
index 7f9fac7..675ab16 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/utils/ValidateUtils.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/utils/ValidateUtils.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.toscaparser.utils;
+package org.openecomp.sdc.toscaparser.api.utils;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
-import org.openecomp.sdc.toscaparser.common.ExceptionCollector;
+import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector;
 
 public class ValidateUtils {
 	
diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
index 8d04d97..dd0e96c 100644
--- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
+++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java
@@ -22,10 +22,10 @@ package org.openecomp.sdc.tosca.parser.api;
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.toscaparser.Group;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.Group;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
 
 
 public interface ISdcCsarHelper {
diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
index 5ce66a5..b5fb6af 100644
--- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
+++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java
@@ -34,15 +34,15 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
 import org.openecomp.sdc.tosca.parser.utils.SdcToscaUtility;
-import org.openecomp.sdc.toscaparser.Group;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.Property;
-import org.openecomp.sdc.toscaparser.SubstitutionMappings;
-import org.openecomp.sdc.toscaparser.TopologyTemplate;
-import org.openecomp.sdc.toscaparser.ToscaTemplate;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
-import org.openecomp.sdc.toscaparser.elements.NodeType;
-import org.openecomp.sdc.toscaparser.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.Group;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.Property;
+import org.openecomp.sdc.toscaparser.api.SubstitutionMappings;
+import org.openecomp.sdc.toscaparser.api.TopologyTemplate;
+import org.openecomp.sdc.toscaparser.api.ToscaTemplate;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.elements.NodeType;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
index f8ac3cc..3f62e12 100644
--- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
+++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java
@@ -5,9 +5,9 @@ import java.util.List;
 
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
-import org.openecomp.sdc.toscaparser.ToscaTemplate;
-import org.openecomp.sdc.toscaparser.common.JToscaException;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.ToscaTemplate;
+import org.openecomp.sdc.toscaparser.api.common.JToscaException;
 
 public class SdcToscaParserFactory{
 
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
index e92502c..0bda21e 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
@@ -2,8 +2,8 @@ package org.openecomp.sdc.impl;
 
 import org.junit.Test;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.Group;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.Group;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 
 import java.util.List;
 
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
index 6744536..9321bc6 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.impl;
 
 import org.junit.Test;
-import org.openecomp.sdc.toscaparser.elements.Metadata;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
index 3ca3ca4..469ddd2 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
@@ -10,8 +10,8 @@ import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Test;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.Group;
-import org.openecomp.sdc.toscaparser.NodeTemplate;
+import org.openecomp.sdc.toscaparser.api.Group;
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;
 
 public class ToscaParserNodeTemplateTest extends BasicTest {
 
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
index 30aff6a..3444e53 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.impl;
 
 import org.junit.Test;
-import org.openecomp.sdc.toscaparser.parameters.Input;
+import org.openecomp.sdc.toscaparser.api.parameters.Input;
 
 import java.util.List;
 
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java
index 3437b8d..d4b474f 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java
@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
 import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.toscaparser.common.JToscaException;
+import org.openecomp.sdc.toscaparser.api.common.JToscaException;
 
 import java.io.File;
 import java.io.IOException;