Merge "Convert Babel from AJSC2 to Spring Boot 1.5.12"

135 files changed, 378 insertions, 1847 deletions

diff --git a/README.md b/README.md
index 62f04bf..9943c93 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,10 @@ _babel-auth.properties_
 _artifact-generator.properties_ <br />
 Contains model invariants ids used by SDC artifact generator library
 
+_logback.xml_
+
+Logging configuration.
+
 ##### Contents of /opt/app/babel/appconfig/auth 
 _auth_policy.json_
  
diff --git a/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml b/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
deleted file mode 100644
index e7568ca..0000000
--- a/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-	<property name="logDirectory" value="${AJSC_HOME}/log" />
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-			</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>DEBUG</level>
-		</filter>
-		<file>${logDirectory}/info_ajsc.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/info_ajsc.%i.log.zip
-			</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-		</encoder>
-	</appender>
-	<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-		<file>${logDirectory}/error_ajsc.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/error_ajsc.%i.log.zip
-			</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n"</pattern> -->
-			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="AJSC-AUDIT" class="ch.qos.logback.classic.net.SyslogAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<syslogHost>localhost</syslogHost>
-		<facility>USER</facility>
-		<!-- Note the colon character below - it is important part of "TAG" message format 
-			You need a colon to determine where the TAG field ends and the CONTENT begins -->
-		<suffixPattern>AJSC_AUDIT: [%thread] [%logger] %msg</suffixPattern>
-	</appender>
-	<appender name="CONTROLLER-AUDIT" class="ch.qos.logback.classic.net.SyslogAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<syslogHost>localhost</syslogHost>
-		<facility>USER</facility>
-		<!-- Note the colon character below - it is important part of "TAG" message format 
-			You need a colon to determine where the TAG field ends and the CONTENT begins -->
-		<suffixPattern>AJSC_AUDIT: [%thread] [%logger] mdc:[%mdc] %msg
-		</suffixPattern>
-	</appender>
-
-	<root level="off">
-		<appender-ref ref="ERROR" />
-		<appender-ref ref="INFO" />
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>
diff --git a/ajsc-shared-config/etc/logback.xml b/ajsc-shared-config/etc/logback.xml
deleted file mode 100644
index 6f6cb49..0000000
--- a/ajsc-shared-config/etc/logback.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<configuration scan="true" scanPeriod="30 seconds" debug="true">
-	<property name="componentName" value="AAI-BAS" />
-	<property name="logDirectory" value="${AJSC_HOME}/logs/${componentName}" />
-
-	<!-- default EELF log file names -->
-	<property name="generalLogName" value="error" />
-	<property name="metricsLogName" value="metrics" />
-	<property name="auditLogName" value="audit" />
-	<property name="debugLogName" value="debug" />
-
-	<property name="errorLogPattern"
-		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" />
-
-	<property name="auditLogPattern"
-		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
-
-	<property name="metricsLogPattern"
-		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" />
-
-	<!-- ============================================================================ -->
-	<!-- EELF Appenders -->
-	<!-- ============================================================================ -->
-
-	<appender name="EELF" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${generalLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
-			</fileNamePattern>
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${errorLogPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-		<!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELF" />
-	</appender>
-
-	<!-- EELF Audit Appender. This appender is used to record audit engine related logging events. The audit logger and appender 
-		are specializations of the EELF application root logger and appender. This can be used to segregate Policy engine events 
-		from other components, or it can be eliminated to record these events as part of the application root log. -->
-
-	<appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${auditLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
-			</fileNamePattern>
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${auditLogPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFAudit" />
-	</appender>
-
-	<appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${metricsLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
-			</fileNamePattern>
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${metricsLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFMetrics" />
-	</appender>
-
-	<appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>
-			${logDirectory}/${debugLogName}.log
-		</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
-			</fileNamePattern>
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${errorLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-		<!-- allow only events with a level below INFO, that is TRACE and DEBUG -->
-		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-			<evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-				<expression>
-					e.level.toInt() &lt; INFO.toInt()
-				</expression>
-			</evaluator>
-			<OnMismatch>DENY</OnMismatch>
-			<OnMatch>NEUTRAL</OnMatch>
-		</filter>
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFDebug" />
-		<includeCallerData>false</includeCallerData>
-	</appender>
-
-	<!-- ============================================================================ -->
-	<!-- Default / root appenders -->
-	<!-- This determines the logging level for 3rd party code -->
-	<!-- ============================================================================ -->
-
-	<root level="INFO">
-		<appender-ref ref="asyncEELF" />
-		<appender-ref ref="asyncEELFDebug" />
-	</root>
-
-	<!-- ============================================================================ -->
-	<!-- EELF loggers -->
-	<!-- ============================================================================ -->
-
-	<logger name="com.att.eelf" level="INFO" additivity="false">
-		<appender-ref ref="asyncEELF" />
-	</logger>
-
-	<!-- The level of this logger determines the contents of the debug log -->
-	<logger name="com.att.eelf.debug" level="INFO" additivity="false">
-		<appender-ref ref="asyncEELFDebug" />
-	</logger>
-
-	<logger name="com.att.eelf.audit" level="INFO" additivity="false">
-		<appender-ref ref="asyncEELFAudit" />
-	</logger>
-
-	<logger name="com.att.eelf.metrics" level="INFO" additivity="false">
-		<appender-ref ref="asyncEELFMetrics" />
-	</logger>
-
-	<!-- ============================================================================ -->
-	<!-- Non-EELF loggers -->
-	<!-- ============================================================================ -->
-
-	<!-- ATT packages including DMAAP message routing -->
-	<logger name="com.att" level="INFO" />
-
-	<!-- Spring related loggers -->
-	<logger name="org.springframework" level="WARN" />
-	<logger name="org.springframework.beans" level="WARN" />
-	<logger name="org.springframework.web" level="WARN" />
-
-	<!-- AJSC Services (bootstrap services) -->
-	<logger name="ajsc" level="WARN" />
-	<logger name="ajsc.RouteMgmtService" level="WARN" />
-	<logger name="ajsc.ComputeService" level="WARN" />
-	<logger name="ajsc.VandelayService" level="WARN" />
-	<logger name="ajsc.FilePersistenceService" level="WARN" />
-	<logger name="ajsc.UserDefinedJarService" level="WARN" />
-	<logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-	<logger name="ajsc.LoggingConfigurationService" level="WARN" />
-
-	<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet logging) -->
-	<logger name="ajsc.utils" level="WARN" />
-	<logger name="ajsc.utils.DME2Helper" level="WARN" />
-	<logger name="ajsc.filters" level="WARN" />
-	<logger name="ajsc.beans.interceptors" level="WARN" />
-	<logger name="ajsc.restlet" level="WARN" />
-	<logger name="ajsc.servlet" level="WARN" />
-	<logger name="com.att.ajsc.csi.logging" level="WARN" />
-	<logger name="com.att.ajsc.filemonitor" level="WARN" />
-
-	<!-- Other Loggers that may help troubleshoot -->
-	<logger name="org.apache" level="WARN" />
-	<logger name="org.apache.commons" level="WARN" />
-
-	<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. May aid in troubleshooting) -->
-	<logger name="org.apache.camel" level="WARN" />
-	<logger name="org.apache.cxf" level="WARN" />
-	<logger name="org.apache.camel.processor.interceptor" level="WARN" />
-	<logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-	<logger name="org.apache.cxf.service" level="WARN" />
-	<logger name="org.restlet" level="WARN" />
-	<logger name="org.apache.camel.component.restlet" level="WARN" />
-
-	<!-- logback internals logging -->
-	<logger name="ch.qos.logback.classic" level="WARN" />
-	<logger name="ch.qos.logback.core" level="WARN" />
-
-</configuration>
diff --git a/antBuild/build.xml b/antBuild/build.xml
deleted file mode 100644
index ab0f890..0000000
--- a/antBuild/build.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<project>
-	<target name="runLocal">
-		<java dir="${basedir}" fork="yes" newenvironment="true"
-			failonerror="true" classname="com.att.ajsc.runner.Runner">
-			<classpath
-				path="${classpath}:${basedir}/ajsc-shared-config/etc:${runAjscHome}/lib/ajsc-runner-${ajscRuntimeVersion}.jar" />
-
-			<!-- Windows Users may need to add a jvmarg arg to create a temp directory 
-				properly. -->
-			<!-- <jvmarg value="-Djava.io.tmpdir=C:/yourTempDirectory"/> -->
-
-			<!-- Uncomment the following 2 jvmarg values to enable Remote Debugging. 
-			 -->
-			<!-- <jvmarg value="-Xdebug" /> -->
-			<!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432" 
-				/> -->
-
-			<jvmarg value="-XX:MaxPermSize=512m" />
-			<jvmarg value="-Xmx1024m" />
-
-			<!-- Main ajsc Variables below (Variables necessary for proper startup 
-				of AJSC) -->
-			<env key="AJSC_HOME" value="${runAjscHome}" />
-			<sysproperty key="AJSC_HOME" value="${runAjscHome}" />
-			<!-- you may specify any external location for AJSC_CONF_HOME where etc 
-				folder & all other configs can be found under it. If not specified, it will 
-				default to AJSC_HOME -->
-			<sysproperty key="AJSC_CONF_HOME" value="${basedir}/bundleconfig-local" />
-			<sysproperty key="AJSC_SHARED_CONFIG" value="${basedir}/ajsc-shared-config" />
-
-			<!-- Location of logback.xml file used for logging configurations. Please, 
-				note, when deploying a service to either CSI or NON-CSI environment, this 
-				system property will be set in sys-props.properties file. We are setting 
-				it here for running locally due to the ease of use of maven variable for 
-				basedir. -->
-			<sysproperty key="logback.configurationFile"
-				value="${basedir}/ajsc-shared-config/etc/logback.xml" />
-
-			<!-- Setting system properties for the AJSC external libs and properties 
-				folders below. When deploying to a node, these properties will be set within 
-				the bundleconfig/etc/sysprops/sys-props.properties file. However, when running 
-				locally, the ${basedir} substitution works more efficiently in this manner. -->
-			<sysproperty key="AJSC_EXTERNAL_LIB_FOLDERS" value="${basedir}/target/commonLibs" />
-			<sysproperty key="AJSC_EXTERNAL_PROPERTIES_FOLDERS"
-				value="${basedir}/ajsc-shared-config/etc" />
-
-			<!-- End of Main ajsc Variables below (Variables necessary for proper 
-				startup of AJSC) -->
-
-			<!-- Uncomment the following line to add oauthentication to your Service -->
-			<!-- <sysproperty key="spring.profiles.active" value="oauth" /> -->
-
-			<!-- If using Cassandra as Database, Enter the ip/host and port below 
-				based on your known configuration -->
-			<!-- <sysproperty key="cassandra.ip" value="hostname" /> -->
-			<!-- <sysproperty key="cassandra.port" value="9042" /> -->
-
-			<!-- The APP_SERVLET_URL_PATTERN variable is defaulted to "/services" 
-				within the initial configuration of the AJSC. If you are changing the CamelServlet 
-				Filter within the ajsc-override-web.xml, you should use that url-pattern 
-				here. This is necessary to properly register your service with dme2. An empty 
-				value, "", is used when NO value is wanted (url-pattern would be /* for CamelServlet 
-				Filter) -->
-			<!-- As of 4.5.1, this property is no longer needed -->
-			<!-- <sysproperty key="APP_SERVLET_URL_PATTERN" value="/services" /> -->
-
-			<!-- GRM/DME2 System Properties below -->
-			<sysproperty key="AJSC_SERVICE_NAMESPACE" value="${module.ajsc.namespace.name}" />
-			<sysproperty key="AJSC_SERVICE_VERSION" value="${module.ajsc.namespace.version}" />
-			<sysproperty key="SOACLOUD_SERVICE_VERSION" value="${project.version}" />
-			<!-- End of GRM/DME2 System Property Variables -->
-
-			<!-- The following server.port variable was necessary for the proper registration 
-				of the AJSC to dme2. This value may still need to be used if the Developer 
-				is hardcoding their port (example: 8080). Then, the server.port value="8080". 
-				The default functionality for the AJSC is to use EPHEMERAL ports. In this 
-				case, you do NOT need to set the server.port value. The AJSC will find the 
-				proper port value and register to dme2 correctly -->
-			<!-- <sysproperty key="server.port" value="${serverPort}" /> -->
-
-			<!-- Command Line Arguments to add to the java command. Here, you can 
-				specify the port as well as the Context you want your service to run in. 
-				Use context=/ to run in an unnamed Context (Root Context). The default configuration 
-				of the AJSC is to run under the /ajsc Context. Setting the port here can 
-				aid during the development phase of your service. However, you can leave 
-				this argument out entirely, and the AJSC will default to using an Ephemeral 
-				port. -->
-			<arg line="context=/ port=${serverPort} sslport=${sslport}" />
-		</java>
-	</target>
-	<target name="prep_home_directory_for_swm_pkgcreate">
-
-<!-- ********* GENERATE CADI KEY AND ENCRYPTED PASSWORD ***********
-     
-            Uncomment the following if your cadi key get corrupted , It would 
-			generate the Cadi key and password in the package phase and keep the key 
-			in the 'src/main/config/ajscKey' and password in the bottom of cadi.properties(you 
-			need to modify the 'aaf_pass' variable with this value . Plese modify the 
-			template.cadi.properties as well before uploading to SOA node 
--->
-
-<!-- 
-		<java jar="${basedir}/target/userjars/cadi-core-1.2.5.jar" fork="true"> 
-		<arg value="keygen" /> <arg value="src/main/config/ajscKey" /> 
-		</java> 
-		
-		<echo>***Cadi Key file generated ****</echo> 
-		
-		<java jar="${basedir}/target/userjars/cadi-core-1.2.5.jar" 
-		fork="true" append="true" output="${basedir}/src/main/config/cadi.properties"> 
-		<arg value="digest" /> <arg value="ajscRocks!" /> <arg value="src/main/config/ajscKey" 
-		/> 
-		</java> 
-		
--->
-
-
-
-		<!-- These tasks are copying contents from the installHomeDirectory into 
-			the eventual $AJSC_HOME directory for running locally and soa cloud installation -->
-		<echo message="ENTERING 'prep_home_directory_for_swm_pkgcreate' ant tasks" />
-
-		<!-- Please, NOTE: The ajsc-archetype is setup for a default CSI Env deployment. 
-			If you are deploying to a CSI Env, you should NOT have to change anything 
-			within this build file. However, if you are NOT deploying to a CSI Env, you 
-			should comment OUT the CSI related portion of this build.xml. -->
-
-		<!-- The following code snippet is copying the bundleconfig-csi directory 
-			to the proper installation/bundleconfig directory used in CSI envs. If you 
-			are NOT installing to a CSI node, you should comment out (or delete) the 
-			following snippet, and uncomment the NON-CSI copy task to copy EVERYTHING 
-			to the installation/bundleconfig directory. -->
-
-		<!-- CSI related bundleconfig copy task. If you are NOT deploying to a 
-			CSI Env, please COMMENT OUT or delete the following copy task code snippet. -->
-		<!--<copy toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bundleconfig" 
-			failonerror="true"> <fileset dir="${basedir}/bundleconfig-csi" /> </copy> -->
-		<!-- End of CSI related bundleconfig copy task -->
-
-		<!-- NOTE: If you are NOT deploying to CSI environment, and you are NOT 
-			using an AJSC_SHARED_CONFIG location on a node, you should go ahead and copy 
-			EVERYTHING from bundleconfig and ajsc-shared-config (logback.xml) directory 
-			to utilize proper logging from logback.xml. Simply, uncomment the following 
-			code snippet below to copy EVERYTHING and comment out the CSI related build 
-			script above. -->
-		<!-- NON-CSI related build copy task. Please, uncomment the following code 
-			snippet to deploy the proper artifacts to a NON-CSI Env. -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bundleconfig"
-			failonerror="true">
-			<fileset dir="${basedir}/bundleconfig-local" includes="**/**" />
-		</copy>
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bundleconfig/etc"
-			failonerror="true">
-			<fileset dir="${basedir}/ajsc-shared-config/etc" includes="**/**" />
-		</copy>
-		<!-- End of NON-CSI related build copy task. -->
-
-		<!-- Copying any zips (deployment packages) to $AJSC_HOME/services for 
-			auto-deployment -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/services"
-			failonerror="false">
-			<fileset dir="${basedir}/services" includes="*.zip" />
-		</copy>
-
-		<!-- Copying runtimeEnvironment zip file to $AJSC_HOME/runtime and renaming 
-			runtimeEnvironment.zip for proper auto-deployment of ajsc services. 
-		<copy
-			tofile="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/runtime/runtimeEnvironment.zip">
-			<fileset dir="target" includes="*-runtimeEnvironment.zip" />
-		</copy>-->
-
-		<!-- Copying dependencies from the service project (not provided by AJSC 
-			Container) to the $AJSC_HOME/extJars folder to be accessible on the classpath -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extJars"
-			failonerror="false">
-			<fileset dir="target/userjars" includes="*" />
-		</copy>
-
-		<!-- extApps directory MUST be created for ajsc-runner to run correctly, 
-			even if empty. DO NOT REMOVE!!! -->
-		<!-- extApps directory created to deploy other war files on startup or 
-			hot deploy War files after ajsc starts up. -->
-		<mkdir
-			dir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps" />
-
-		<!-- Copying any extra wars to $AJSC_HOME/extApps to be deployed within 
-			AJSC -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extApps"
-			failonerror="false">
-			<fileset dir="${basedir}/src/main/resources/extApps"
-				includes="*" />
-		</copy>
-
-		<!-- staticContent folder is for serving static content within an ajsc 
-			service. Any static content to be served will be copyied to the ultimate 
-			$AJSC_HOME/staticContent folder and can be served with the att-static-content 
-			camel component. -->
-		<!-- Uncomment the following snippet to copy items from staticContent folder 
-			to ultimate $AJSC_HOME/staticConent -->
-		<!-- <copy toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/staticContent" 
-			failonerror="false"> <fileset dir="${basedir}/staticContent" includes="**/**" 
-			/> </copy> -->
-
-		<!-- Copying extra jar files that have been labeled as dependencies in 
-			service project to /extJars folder to be made available on the classpath 
-			for your service -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/extJars"
-			failonerror="false">
-			<fileset dir="target" includes="*.jar" />
-		</copy>
-
-		<!-- Copying deployment packages created within the project to the $AJSC_HOME/services 
-			folder to be auto deployed. -->
-		<copy
-			toDir="${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/services">
-			<fileset dir="target" includes="*.zip" excludes="*-runtimeEnvironment.zip" />
-		</copy>
-
-		<echo message="EXITING 'prep_assembly_output_for_swm_plugin' ant tasks" />
-	</target>
-</project>
diff --git a/appconfig-local/auth/auth_policy.json b/appconfig-local/auth/auth_policy.json
deleted file mode 100644
index 5340a6a..0000000
--- a/appconfig-local/auth/auth_policy.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{"roles": [
-    {
-        "name": "admin",
-        "functions": [
-            {
-                "name": "generateArtifacts",
-                "methods": [{"name": "POST"}]
-            }
-        ],
-        "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
-        ]
-    },
-    {
-        "name": "ops",
-        "functions": [{
-            "name": "actions",
-            "methods": [{"name": "POST"}]
-        }],
-        "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
-        ]
-    },
-    {
-        "name": "readonly",
-        "functions": [
-            {
-                "name": "actions",
-                "methods": [{"name": "GET"}]
-            }
-        ],
-        "users": [
-            {"username": "CN=someone.onap.org, OU=someone, O=\"ONAP ORG\", L=NA, ST=NA, C=NA"}
-        ]
-    },
-    {
-        "name": "basicauth",
-        "functions": [{
-            "name": "util",
-            "methods": [{"name": "GET"}]
-        }],
-        "users": [{
-            "user": "aai",
-            "pass": "OBF:deadbeef"
-        }]
-    }
-]}
diff --git a/appconfig-local/babel-auth.properties b/appconfig-local/babel-auth.properties
deleted file mode 100644
index 5fd2646..0000000
--- a/appconfig-local/babel-auth.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-auth.policy.file=/auth/auth_policy.json
-auth.authentication.disable=false
\ No newline at end of file
diff --git a/bundleconfig-local/README.txt b/bundleconfig-local/README.txt
deleted file mode 100644
index b260008..0000000
--- a/bundleconfig-local/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-The bundleconfig-local directory contains the necessary configuration files 
\ No newline at end of file
diff --git a/bundleconfig-local/etc/appprops/AAFUserRoles.properties b/bundleconfig-local/etc/appprops/AAFUserRoles.properties
deleted file mode 100644
index eea2b61..0000000
--- a/bundleconfig-local/etc/appprops/AAFUserRoles.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#If using AAF for Role based authentication/authorization, define your routes/services which will utilize AAF. The AJSC will
-#read this file and protect the routes given with the AAF role defined.
-
-#The following example would protect the JAXRS echo example service provided with the archetype.
-#/services/${namespace}/v1/jaxrs-services/jaxrsExample/echo/*=com.att.ajsc.myper|mymachine|manage
-
-#The following example would protect ALL AJSC services running within your project.
-#/**=com.att.ajsc.myperm|mymachine|manage
-
-#The following example would protect ALL REST services utilizing the Camel restlet routes.
-#/rest/**=com.att.ajsc.myperm|mymachine|manage
diff --git a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties
deleted file mode 100644
index 17b5036..0000000
--- a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service.
-
diff --git a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties
deleted file mode 100644
index ddaefdd..0000000
--- a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. 
-
-/**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor
diff --git a/bundleconfig-local/etc/appprops/app-intercepts.properties b/bundleconfig-local/etc/appprops/app-intercepts.properties
deleted file mode 100644
index a6ca85a..0000000
--- a/bundleconfig-local/etc/appprops/app-intercepts.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#This is where all your application intercept strategies must be configured. AJSC reads this property file and adds
-#the list of intercepts specified here to the camel context. This can be useful for accessing every exchange object transferred from/to
-#each endpoint in the request/response flow and can allow for more precise debugging and/or processing of the exchange. 
-
-#e.g. 
-#intercepts=org.onap.aai.JaxrsEchoService,packagename.class1name,packagename.class2name
diff --git a/bundleconfig-local/etc/appprops/methodMapper.properties b/bundleconfig-local/etc/appprops/methodMapper.properties
deleted file mode 100644
index af7da6e..0000000
--- a/bundleconfig-local/etc/appprops/methodMapper.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-// 	Json object holds the method mapping.Update the JSON object with the proper route to logical mapping based 
-// 	on the example provided below : 
-//  	"helloWorld"  = Service Name
-//  	"method"   = http method
-//  	"url" = the url component from the route
-//  	"logicalName"=  When a combination of method and url from the route matches the json object , 
-//  	the logical name is put in the http header as "x-CSI-ServiceName" and "x-CSI-MethodName" 
-//  	"dme2url"= if provided it register the endpoint to GRM, it is optional. This is useful for JAX-RS services.
-  
-{
-    "helloWorld": [
-        {
-            "method": "get",
-            "url": "/rest/babel/v1/helloWorld",
-            "logicalName": "GetMethod(Logical)"
-        },
-        {
-            "method": "get",
-            "url": "/services/babel/v1/jaxrsExample/jaxrs-services/echo/{input}",
-            "logicalName": "GetJaxrsExampleEcho(Logical)",
-            "dme2url": "/services/babel/v1/jaxrsExample/jaxrs-services/echo/{input}"
-        },
-        {
-            "method": "get",
-            "url": "/services/babel/v1/jaxrsExample/jaxrs-services/property/{fileName}/{input}",
-            "logicalName": "GetJaxrsExampleProperty(Logical)",
-            "dme2url": "/services/babel/v1/jaxrsExample/jaxrs-services/property/{fileName}/{input}"
-        }
-    ],
-	     "errormessage":
-	    [
-	        {
-	        	"method": "get",
-	         	"url": "/services/babel/v1/jaxrsExample/errormessage/emls",
-	         	"logicalName": "setCAETHeaders(Logical)"
-	       	},
-	        {
-	        	"method": "get",
-	        	"url": "/services/babel/v1/errorMessageLookupService2",
-	        	"logicalName": "setCAETHeaders(Logical)"
-	       	}        
-	    
-	    ]
-}
\ No newline at end of file
diff --git a/bundleconfig-local/etc/sysprops/sys-props.properties b/bundleconfig-local/etc/sysprops/sys-props.properties
deleted file mode 100644
index cce76a1..0000000
--- a/bundleconfig-local/etc/sysprops/sys-props.properties
+++ /dev/null
@@ -1,135 +0,0 @@
-# ============LICENSE_START=======================================================
-# org.onap.aai
-# ================================================================================
-# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2017-2018 European Software Marketing Ltd.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
- *
-#       http://www.apache.org/licenses/LICENSE-2.0
- *
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
- 
-#This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly.
-#The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed
-#to a SOA/CSI Cloud node. 
-
-#AJSC System Properties. The following properties are required for ALL AJSC services. If you are adding System Properties for your
-#particular service, please add them AFTER all AJSC related System Properties. 
-
-#For Cadi Authorization, use value="authentication-scheme-1
-CadiAuthN=authentication-scheme-1
-
-#For Basic Authorization, use value="authentication-scheme-1
-authN=authentication-scheme-2
-
-#Persistence used for AJSC meta-data storage. For most environments, "file" should be used.
-ajscPersistence=file
-
-#For Direct Invocation to be enabled (values=true/false)
-directInvocationEnable=false
-
-# If using hawtio for local development, these properties will allow for faster server startup and usage for local development
-
-hawtio.authenticationEnabled=false
-hawtio.config.pullOnStartup=false
-
-#Removes the extraneous restlet console output
-org.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade
-
-#server.host property to be enabled for local DME2 related testing
-#server.host=<Your network IP address> 
-
-#Enable/disable SSL (values=true/false). This property also determines which protocol to use (https if true, http otherwise), to register services into GRM through DME2.
-enableSSL=true
-
-
-#Enable/disable EJB Container
-ENABLE_EJB=false
-
-#Enable/disable OSGI
-isOSGIEnable=false
-
-#Generate/Skip api docs
-isApiDoc=false
-
-#CSI related variables for CSM framework
-csm.hostname=servername
-
-
-#SOA_CLOUD_ENV is used to register your service with dme2 and can be turned off for local development (values=true/false).
-SOA_CLOUD_ENV=false
-
-#CONTINUE_ON_LISTENER_EXCEPTION will exit the application if there is a DME2 exception at the time of registration.
-CONTINUE_ON_LISTENER_EXCEPTION=false
-
-#Jetty Container ThreadCount Configuration Variables
-AJSC_JETTY_ThreadCount_MIN=1
-AJSC_JETTY_ThreadCount_MAX=200
-AJSC_JETTY_IDLETIME_MAX=3000
-
-#Camel Context level default threadPool Profile configuration
-CAMEL_POOL_SIZE=10
-CAMEL_MAX_POOL_SIZE=20
-CAMEL_KEEP_ALIVE_TIME=60
-CAMEL_MAX_QUEUE_SIZE=1000
-
-#GRM/DME2 System Properties
-AFT_DME2_CONN_IDLE_TIMEOUTMS=5000
-AJSC_ENV=SOACLOUD
-
-SOACLOUD_NAMESPACE=
-SOACLOUD_ENV_CONTEXT=DEV
-SOACLOUD_PROTOCOL=http
-SOACLOUD_ROUTE_OFFER=DEFAULT
-
-AFT_LATITUDE=
-AFT_LONGITUDE=
-AFT_ENVIRONMENT=
-
-#Restlet Component Default Properties
-RESTLET_COMPONENT_CONTROLLER_DAEMON=true
-RESTLET_COMPONENT_CONTROLLER_SLEEP_TIME_MS=100
-RESTLET_COMPONENT_INBOUND_BUFFER_SIZE=8192
-RESTLET_COMPONENT_MIN_THREADS=1
-RESTLET_COMPONENT_MAX_THREADS=10
-RESTLET_COMPONENT_LOW_THREADS=8
-RESTLET_COMPONENT_MAX_QUEUED=0
-RESTLET_COMPONENT_MAX_CONNECTIONS_PER_HOST=-1
-RESTLET_COMPONENT_MAX_TOTAL_CONNECTIONS=-1
-RESTLET_COMPONENT_OUTBOUND_BUFFER_SIZE=8192
-RESTLET_COMPONENT_PERSISTING_CONNECTIONS=true
-RESTLET_COMPONENT_PIPELINING_CONNECTIONS=false
-RESTLET_COMPONENT_THREAD_MAX_IDLE_TIME_MS=60000
-RESTLET_COMPONENT_USE_FORWARDED_HEADER=false
-RESTLET_COMPONENT_REUSE_ADDRESS=true
-
-#Externalized jar and properties file location. In CSI environments, there are a few libs that have been externalized to aid
-#in CSTEM maintenance of the versions of these libs. The most important to the AJSC is the DME2 lib. Not only is this lib necessary
-#for proper registration of your AJSC service on a node, but it is also necessary for running locally as well. Another framework
-#used in CSI envs is the CSM framework. These 2 framework libs are shown as "provided" dependencies within the pom.xml. These
-#dependencies will be copied into the target/commonLibs folder with the normal "mvn clean package" goal of the AJSC. They will
-#then be added to the classpath via AJSC_EXTERNAL_LIB_FOLDERS system property. Any files (mainly property files) that need
-#to be on the classpath should be added to the AJSC_EXTERNAL_PROPERTIES_FOLDERS system property. The default scenario when 
-#testing your AJSC service locally will utilize the target/commonLibs directory for DME2 and CSM related artifacts and 2 
-#default csm properties files will be used for local testing with anything CSM knorelated.
-#NOTE: we are using maven-replacer-plugin to replace "(doubleUnderscore)basedir(doubleUnderscore)" with ${basedir} within the 
-#target directory for running locally. Multiple folder locations can be separated by the pipe ("|") character.
-#Please, NOTE: for running locally, we are setting this system property in the antBuild/build.xml "runLocal" target and in the 
-#"runAjsc" profile within the pom.xml. This is to most effectively use maven variables (${basedir}, most specifically. Therefore,
-#when running locally, the following 2 properties should be set within the profile(s) themselves. 
-#Example: target/commonLibs|target/otherLibs
-#AJSC_EXTERNAL_LIB_FOLDERS=__basedir__/target/commonLibs
-#AJSC_EXTERNAL_PROPERTIES_FOLDERS=__basedir__/ajsc-shared-config/etc
-#End of AJSC System Properties
-
-#Service System Properties. Please, place any Service related System Properties below.
-KEY_STORE_PASSWORD=
-KEY_MANAGER_PASSWORD=
diff --git a/pom.xml b/pom.xml
index f9a5f69..1851348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     ============LICENSE_START=======================================================
@@ -25,112 +26,78 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>ajsc-archetype-parent</artifactId>
-		<groupId>com.att.ajsc</groupId>
-		<version>2.0.0</version>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.1.0</version>
+		<relativePath />
 	</parent>
-	<groupId>org.onap.aai.babel</groupId>
+
+	<groupId>org.onap.aai</groupId>
 	<artifactId>babel</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
 	<name>aai-babel</name>
+	<description>ONAP AAI Babel Microservice</description>
 
 	<properties>
-		<module.ajsc.namespace.name>babel-service</module.ajsc.namespace.name>
-		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-		<ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
-		<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
-
-        <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> property below. -->
-		<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
-		<runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
+		<!-- Spring boot version -->
+		<spring.boot.version>1.5.12.RELEASE</spring.boot.version>
 
-		<!-- For SOA Cloud Installation -->
-		<installOwnerUser>aaiadmin</installOwnerUser>
-		<installOwnerGroup>aaiadmin</installOwnerGroup>
-		<ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
-
-        <!-- Port Selection. A value of 0 will allow for dynamic port selection. 
-            For local testing, you may choose to hardcode this value to something like 
-            8080 -->
-		<serverPort>9515</serverPort>
-		<sslport>9516</sslport>
-
-		<testRouteOffer>workstation</testRouteOffer>
-		<testEnv>DEV</testEnv>
-		<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-		<sitePath>/content/sites/site/org/onap/aai/babel/${project.artifactId}/${project.version}</sitePath>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<docker.location>${basedir}/target</docker.location>
 
 		<!-- Dependency Versions -->
-		<aai.rest.client.version>1.2.1</aai.rest.client.version>
-		<apache.lang3.version>3.6</apache.lang3.version>
-		<commons-compress.version>1.14</commons-compress.version>
 		<common.logging.version>1.2.2</common.logging.version>
-		<dom4j.version>1.6.1</dom4j.version>
-		<hamcrest.version>1.3</hamcrest.version>
-		<javaassist.version>3.21.0-GA</javaassist.version>
-		<logback.version>1.1.9</logback.version>
+		<sdc.tosca.version>1.3.0</sdc.tosca.version>
+		<commons.compress.version>1.16.1</commons.compress.version>
+		<javax.ws.rs.version>2.1</javax.ws.rs.version>
 		<mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
-		<mockito.version>1.10.19</mockito.version>
-		<powermock.version>1.6.2</powermock.version>
-		<sdc.distribution.client.version>1.1.32</sdc.distribution.client.version>
-		<sdc.tosca.version>1.3.3</sdc.tosca.version>
-        <fasterxml.version>2.9.4</fasterxml.version>
-		<jacoco.version>0.7.9</jacoco.version>
+		<aai-schema.group.id>org.onap.aai.aai-common</aai-schema.group.id>
+		<aai-schema.version>1.2.3</aai-schema.version>
+		<apache.lang3.version>3.7</apache.lang3.version>
+		<aai.rest.client.version>1.2.1</aai.rest.client.version>
+		<sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
 		<xmlunit.version>1.6</xmlunit.version>
-		<aai-schema.version>1.2.1</aai-schema.version>
-		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-		<docker.location>${basedir}/target</docker.location>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0.1</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>${dom4j.version}</version>
-			<scope>provided</scope>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jersey</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.att.aft</groupId>
-			<artifactId>dme2</artifactId>
-		</dependency>
-
-		<!-- Common logging framework -->
-		<dependency>
 			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
 			<version>${common.logging.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>${logback.version}</version>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
 		</dependency>
-
-		<!-- apache commons -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>${commons-compress.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
+			<version>${commons.compress.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -138,59 +105,40 @@
 			<version>${apache.lang3.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.sdc-tosca</groupId>
-			<artifactId>sdc-tosca</artifactId>
-			<version>${sdc.tosca.version}</version>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>${javax.ws.rs.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-            <version>${fasterxml.version}</version><!--$NO-MVN-MAN-VER$ -->
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.onap.aai</groupId>
-            <artifactId>rest-client</artifactId>
-            <version>${aai.rest.client.version}</version>
-        </dependency>
-
-		<!-- Testing -->
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+			<version>8.0</version>
+			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
+			<groupId>org.onap.sdc.sdc-tosca</groupId>
+			<artifactId>sdc-tosca</artifactId>
+			<version>${sdc.tosca.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-javaagent</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
+			<groupId>org.onap.aai</groupId>
+			<artifactId>rest-client</artifactId>
+			<version>${aai.rest.client.version}</version>
 		</dependency>
+
+		<!-- Testing -->
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4-rule-agent</artifactId>
-			<version>${powermock.version}</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>${javaassist.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+			<groupId>org.onap.sdc.sdc-distribution-client</groupId>
 			<artifactId>sdc-distribution-client</artifactId>
 			<version>${sdc.distribution.client.version}</version>
 			<scope>test</scope>
@@ -203,34 +151,30 @@
 		</dependency>
 	</dependencies>
 
-	<repositories>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ECOMP Staging Repository</name>
-			<url>${onap.nexus.url}/content/repositories/staging/</url>
-		</repository>
-	</repositories>
-
-	<distributionManagement>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${onap.nexus.url}/content/repositories/releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${onap.nexus.url}/content/repositories/snapshots/</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${onap.nexus.url}${sitePath}</url>
-		</site>
-	</distributionManagement>
-
 	<build>
+		<finalName>babel</finalName>
 		<plugins>
 			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring.boot.version}</version>
+				<configuration>
+					<jvmArguments>
+						-DCONFIG_HOME=./appconfig-local
+						-DAPP_HOME=.
+						-Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
+						-DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
+					</jvmArguments>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
@@ -243,7 +187,7 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.onap.aai.aai-common</groupId>
+									<groupId>${aai-schema.group.id}</groupId>
 									<artifactId>aai-schema</artifactId>
 									<version>${aai-schema.version}</version>
 									<type>jar</type>
@@ -296,6 +240,7 @@
 			<plugin>
 				<artifactId>exec-maven-plugin</artifactId>
 				<groupId>org.codehaus.mojo</groupId>
+				<version>1.5.0</version>
 				<executions>
 					<execution><!-- Run our script to get latest xsd version -->
 						<id>Get latest xsd version</id>
@@ -312,51 +257,39 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-					<execution>
-						<phase />
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>3.0</version>
 				<configuration>
-					<excludes>
-						<exclude>**/xml/generator/xsd/*.class</exclude>
-					</excludes>
+					<header>License.txt</header>
+					<includes>
+						<include>src/main/java/**</include>
+						<include>src/test/java/**</include>
+						<include>pom.xml</include>
+					</includes>
+					<skipExistingHeaders>true</skipExistingHeaders>
 				</configuration>
 				<executions>
 					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-
-					<execution>
-						<id>report</id>
-						<phase>package</phase>
 						<goals>
-							<goal>report</goal>
+							<!-- Set goal from "check" to "format" to auto update license headers -->
+							<goal>check</goal>
 						</goals>
+						<phase>validate</phase>
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-eclipse-compiler</artifactId>
-				<version>2.9.2-01</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<reuseForks>false</reuseForks>
+					<forkCount>1</forkCount>
+					<environmentVariables>
+						<APP_HOME>.</APP_HOME>
+						<CONFIG_HOME>src/test/resources</CONFIG_HOME>
+					</environmentVariables>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -376,19 +309,16 @@
 								<resource>
 									<directory>${basedir}/src/main/docker</directory>
 									<filtering>true</filtering>
-									<includes>
-										<include>**/*</include>
-									</includes>
 								</resource>
 								<resource>
 									<directory>${basedir}/src/main/bin/</directory>
+									<filtering>true</filtering>
 								</resource>
 							</resources>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -409,20 +339,20 @@
 				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<classifier>client</classifier>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 				<version>0.4.11</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.github.jnr</groupId>
-						<artifactId>jnr-unixsocket</artifactId>
-						<version>0.13</version>
-					</dependency>
-				</dependencies>
 				<configuration>
 					<verbose>true</verbose>
 					<serverId>docker-hub</serverId>
-					<imageName>onap/${project.artifactId}</imageName>
+					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
 					<dockerDirectory>${docker.location}</dockerDirectory>
 					<imageTags>
 						<imageTag>latest</imageTag>
@@ -430,210 +360,7 @@
 					<forceTags>true</forceTags>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<classifier>client</classifier>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.3</version>
-				<configuration>
-					<reportPlugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-checkstyle-plugin</artifactId>
-							<version>2.17</version>
-							<reportSets>
-								<reportSet>
-									<reports>
-										<report>checkstyle</report>
-									</reports>
-								</reportSet>
-							</reportSets>
-						</plugin>
-					</reportPlugins>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${onap.nexus.url}</nexusUrl>
-					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
-				</configuration>
-			</plugin>
-
-			<!-- Strong recommendation to use forkCount and reuseForks parameters as forkMode is deprecated since v2.14 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<reuseForks>false</reuseForks>
-					<forkCount>1</forkCount>
-					<environmentVariables>
-						<AJSC_HOME>.</AJSC_HOME>
-					</environmentVariables>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>com.mycila</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<header>License.txt</header>
-					<includes>
-						<include>src/main/java/**</include>
-						<include>src/test/java/**</include>
-						<include>pom.xml</include>
-					</includes>
-					<skipExistingHeaders>true</skipExistingHeaders>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<!-- Set goal from "check" to "format" to auto update license headers -->
-							<goal>check</goal>
-						</goals>
-					  <phase>process-sources</phase>
-					</execution>
-				</executions>
-			</plugin>
-			
 		</plugins>
-
 	</build>
 
-	<profiles>
-		<profile>
-			<id>runAjsc</id>
-			<build>
-				<defaultGoal>initialize</defaultGoal>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3.2</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>java</goal>
-								</goals>
-								<configuration>
-									<includeProjectDependencies>false</includeProjectDependencies>
-									<includePluginDependencies>true</includePluginDependencies>
-									<executable>java</executable>
-									<mainClass>com.att.ajsc.runner.Runner</mainClass>
-									<executableDependency>
-										<groupId>com.att.ajsc</groupId>
-										<artifactId>ajsc-runner</artifactId>
-									</executableDependency>
-									<additionalClasspathElements>
-										<additionalClasspathElement>${basedir}/ajsc-shared-config/etc</additionalClasspathElement>
-									</additionalClasspathElements>
-
-									<environmentVariables>
-										<AJSC_HOME>${runAjscHome}</AJSC_HOME>
-									</environmentVariables>
-
-									<!-- Main AJSC System Properties below (necessary for proper startup) -->
-									<systemProperties>
-										<systemProperty>
-											<key>AJSC_HOME</key>
-											<value>${runAjscHome}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_HOME</key>
-											<value>${runAjscHome}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_CONF_HOME</key>
-											<value>${basedir}/bundleconfig-local</value>
-										</systemProperty>
-										<systemProperty>
-											<key>logback.configurationFile</key>
-											<value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_SHARED_CONFIG</key>
-											<value>${basedir}/ajsc-shared-config</value>
-										</systemProperty>
-										<sysproperty>
-											<key>AJSC_EXTERNAL_LIB_FOLDERS</key>
-											<value>${basedir}/target/commonLibs</value>
-										</sysproperty>
-										<sysproperty>
-											<key>AJSC_EXTERNAL_PROPERTIES_FOLDERS</key>
-											<value>${basedir}/ajsc-shared-config/etc</value>
-										</sysproperty>
-
-										<systemProperty>
-											<key>AJSC_SERVICE_NAMESPACE</key>
-											<value>${module.ajsc.namespace.name}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>AJSC_SERVICE_VERSION</key>
-											<value>${module.ajsc.namespace.version}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>SOACLOUD_SERVICE_VERSION</key>
-											<value>${project.version}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>server.port</key>
-											<value>${serverPort}</value>
-										</systemProperty>
-										<systemProperty>
-											<key>CONFIG_HOME</key>
-											<value>${basedir}/appconfig-local</value>
-										</systemProperty>
-										<systemProperty>
-											<key>artifactgenerator.config</key>
-											<value>${basedir}/appconfig-local/artifact-generator.properties</value>
-										</systemProperty>
-									</systemProperties>
-
-                                    <!-- Command Line Arguments to add to the java command. Here, you 
-                                        can specify the port as well as the Context you want your service to run 
-                                        in. Use context=/ to run in an unnamed Context (Root Context). The default 
-                                        configuration of the AJSC is to run under the / Context. Setting the port 
-                                        here can aid during the development phase of your service. However, you can 
-                                        leave this argument out entirely, and the AJSC will default to using an Ephemeral 
-                                        port. -->
-									<arguments>
-										<argument>context=/</argument>
-										<argument>port=${serverPort}</argument>
-										<argument>sslport=${sslport}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-						<configuration>
-							<executable>java</executable>
-						</configuration>
-						<dependencies>
-							<dependency>
-								<groupId>com.att.ajsc</groupId>
-								<artifactId>ajsc-runner</artifactId>
-								<version>${ajscRuntimeVersion}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/src/main/ajsc/babel_v1/babel/v1/conf/coreBeans.groovy b/src/main/ajsc/babel_v1/babel/v1/conf/coreBeans.groovy
deleted file mode 100644
index 37043d8..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/conf/coreBeans.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-beans{
-    xmlns cxf: "http://camel.apache.org/schema/cxf"
-    xmlns jaxrs: "http://cxf.apache.org/jaxrs"
-    xmlns util: "http://www.springframework.org/schema/util"
-
-    infoService(org.onap.aai.babel.service.InfoService)
-
-    util.list(id: 'jaxrsServices') { ref(bean:'infoService') }
-}
diff --git a/src/main/ajsc/babel_v1/babel/v1/docs/README.txt b/src/main/ajsc/babel_v1/babel/v1/docs/README.txt
deleted file mode 100644
index 3707179..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/docs/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Place any docs here that you want to access within the ajsc upon deployment of your service.
diff --git a/src/main/ajsc/babel_v1/babel/v1/lib/README.txt b/src/main/ajsc/babel_v1/babel/v1/lib/README.txt
deleted file mode 100644
index 639e21b..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/lib/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-3rd party JAR's needed by your jars (if any) for a ajsc deployment package go here...
\ No newline at end of file
diff --git a/src/main/ajsc/babel_v1/babel/v1/props/module.props b/src/main/ajsc/babel_v1/babel/v1/props/module.props
deleted file mode 100644
index 17ebc08..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/props/module.props
+++ /dev/null
@@ -1 +0,0 @@
-EXAMPLE.PROPERTY=EXAMLE_VALUE
\ No newline at end of file
diff --git a/src/main/ajsc/babel_v1/babel/v1/routes/babel-service.route b/src/main/ajsc/babel_v1/babel/v1/routes/babel-service.route
deleted file mode 100644
index c12bc67..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/routes/babel-service.route
+++ /dev/null
@@ -1,4 +0,0 @@
-<route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="att-dme2-servlet:///__module_ajsc_namespace_name__/__module_ajsc_namespace_version__/app?matchOnUriPrefix=true" />	
-  <to uri="cxfbean:generateArtifacts" />
-</route>
diff --git a/src/main/ajsc/babel_v1/babel/v1/routes/coreServices.route b/src/main/ajsc/babel_v1/babel/v1/routes/coreServices.route
deleted file mode 100644
index 076fb36..0000000
--- a/src/main/ajsc/babel_v1/babel/v1/routes/coreServices.route
+++ /dev/null
@@ -1,4 +0,0 @@
-<route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="att-dme2-servlet:///__module_ajsc_namespace_name__/__module_ajsc_namespace_version__/core?matchOnUriPrefix=true" />
-  <to uri="cxfbean:jaxrsServices" />
-</route>
diff --git a/src/main/assemble/ajsc_module_assembly.xml b/src/main/assemble/ajsc_module_assembly.xml
deleted file mode 100644
index 359f792..0000000
--- a/src/main/assemble/ajsc_module_assembly.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>${version}</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/routes/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/routes/</outputDirectory>
-			<includes>
-				<include>*.route</include>
-			</includes>
-
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/docs/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/docs/</outputDirectory>
-			<includes>
-				<include>*.*</include>
-				<!-- <include>*.vm</include>  -->
-			</includes>
-
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/lib/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/extJars/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/extJars/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		
-		<!-- also try to grab outputs from the "jar" plugin's package phase -->
-		<fileSet>
-			<directory>${project.basedir}/target/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/conf/</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/conf/</outputDirectory>
-			<includes>
-				<include>*.*</include>
-			</includes>
-
-		</fileSet>
-	</fileSets>
-
-</assembly>
-
diff --git a/src/main/assemble/ajsc_props_assembly.xml b/src/main/assemble/ajsc_props_assembly.xml
deleted file mode 100644
index 6ee4093..0000000
--- a/src/main/assemble/ajsc_props_assembly.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>${version}_properties</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-ajsc/props</directory>
-			<outputDirectory>${module.ajsc.namespace.name}/${module.ajsc.namespace.version}/props/</outputDirectory>
-			<includes>
-				<include>*.props</include>
-			</includes>
-
-		</fileSet>
-
-	</fileSets>
-
-</assembly>
-
diff --git a/src/main/assemble/ajsc_runtime_assembly.xml b/src/main/assemble/ajsc_runtime_assembly.xml
deleted file mode 100644
index c86d265..0000000
--- a/src/main/assemble/ajsc_runtime_assembly.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>runtimeEnvironment</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/context/</directory>
-			<outputDirectory>runtime/context/</outputDirectory>
-			<includes>
-				<include>*.context</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/serviceProperties/</directory>
-			<outputDirectory>runtime/serviceProperties/</outputDirectory>
-			<includes>
-				<include>*.props</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroRole</directory>
-			<outputDirectory>runtime/shiroRole/</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroUser</directory>
-			<outputDirectory>runtime/shiroUser/</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet><fileSet>
-			<directory>${project.basedir}/target/versioned-runtime/shiroUserRole</directory>
-			<outputDirectory>runtime/shiroUserRole</outputDirectory>
-			<includes>
-				<include>*.json</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 3aba251..b91c396 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # ============LICENSE_START=======================================================
 # org.onap.aai
@@ -19,47 +19,23 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-AJSC_HOME="${AJSC_HOME-/opt/app/babel/}"
-AJSC_CONF_HOME="$AJSC_HOME/bundleconfig"
+BASEDIR="/opt/app/babel"
+APP_HOME="${BASEDIR}"
 
-if [ -z "$CONFIG_HOME" ]; then
-    echo "CONFIG_HOME must be set in order to start up the process"
-    exit 1
+if [ -z "${CONFIG_HOME}" ]; then
+	echo "CONFIG_HOME must be set in order to start up process"
+	exit 1
 fi
 
-# List of ajsc properties which are exposed for modification at deploy time
-declare -a MODIFY_PROP_LIST=("KEY_STORE_PASSWORD"
-                             "KEY_MANAGER_PASSWORD"
-                             "AJSC_JETTY_ThreadCount_MIN" 
-                             "AJSC_JETTY_ThreadCount_MAX"
-                             "AJSC_JETTY_BLOCKING_QUEUE_SIZE")
-PROP_LIST_LENGTH=${#MODIFY_PROP_LIST[@]}  
-
-for (( i=1; i<${PROP_LIST_LENGTH}+1; i++ ));
-do
-   PROP_NAME=${MODIFY_PROP_LIST[$i-1]}
-   PROP_VALUE=${!PROP_NAME}
-   if [ ! -z "$PROP_VALUE" ]; then
-      sed -i "s/$PROP_NAME=.*$/$PROP_NAME=$PROP_VALUE/g" $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
-   fi
-done
-
-# Change the CLASSPATH separator to ; if your O/S is Windows
-CLASSPATH="$AJSC_HOME/lib/*"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/extJars/"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/etc/"
+if [ -z "${KEY_STORE_PASSWORD}" ]; then
+	echo "KEY_STORE_PASSWORD must be set in order to start up process"
+	exit 1
+fi
 
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
-PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
-PROPS="$PROPS -Dlogback.configurationFile=$AJSC_CONF_HOME/bundleconfig/etc/logback.xml"
-PROPS="$PROPS -DAJSC_SHARED_CONFIG=$AJSC_CONF_HOME"
-PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=babel"
-PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1"
-PROPS="$PROPS -Dserver.port=9516"
-PROPS="$PROPS -Dartifactgenerator.config=$CONFIG_HOME/artifact-generator.properties"
+PROPS="-DAPP_HOME=${APP_HOME}"
+PROPS="${PROPS} -DCONFIG_HOME=${CONFIG_HOME}"
+PROPS="${PROPS} -Dartifactgenerator.config=${CONFIG_HOME}/artifact-generator.properties"
+PROPS="${PROPS} -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}"
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
-echo $CLASSPATH
-
-exec java -Xmx${JVM_MAX_HEAP}m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9516
+exec java -Xmx${JVM_MAX_HEAP}m ${PROPS} -jar ${APP_HOME}/babel.jar
\ No newline at end of file
diff --git a/src/main/config/ajsc-chef.jks b/src/main/config/ajsc-chef.jks
deleted file mode 100644
index aeca770..0000000
--- a/src/main/config/ajsc-chef.jks
+++ /dev/null
diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
deleted file mode 100644
index 68306d4..0000000
--- a/src/main/config/ajsc-jetty.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0"  encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server">
-	<!-- DO NOT REMOVE!!!! This is setting up the AJSC Context -->
-	<New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext">
-		<Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set>
-		<Set name="extractWAR">true</Set>
-		<Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set>
-		<Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set>
-		<Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set>
-		<Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set>
-		<Set name="throwUnavailableOnStartupException">true</Set>
-		<Set name="servletHandler">
-			<New class="org.eclipse.jetty.servlet.ServletHandler">
-				<Set name="startWithUnavailable">false</Set>
-			</New>
-		</Set>
-	</New>
-	
-	<Set name="handler">
-		<New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
-			<Set name="Handlers">
-				<Array type="org.eclipse.jetty.webapp.WebAppContext">
-					<Item>
-						<Ref refid="ajscContext" />
-					</Item>
-				</Array>
-			</Set>
-		</New>
-	</Set>
-	
-	<Call name="addBean">
-		<Arg>
-			<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-				<Set name="contexts">
-					<Ref refid="Contexts" />
-				</Set>
-				<Call id="extAppHotDeployProvider" name="addAppProvider">
-					<Arg>
-						<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-							<Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set>
-							<Set name="scanInterval">10</Set>
-							<Set name="extractWars">true</Set>
-						</New>
-					</Arg>
-				</Call>
-			</New>
-		</Arg>
-	</Call>
-	
-<!-- 	<Call name="addConnector"> -->
-<!-- 		<Arg> -->
-<!-- 			<New class="org.eclipse.jetty.server.ServerConnector"> -->
-<!-- 				<Arg name="server"> -->
-<!-- 					<Ref refid="ajsc-server" /> -->
-<!-- 				</Arg> -->
-<!-- 				<Set name="port"><SystemProperty name="AJSC_HTTP_PORT" default="8080" /></Set> -->
-<!-- 			</New> -->
-<!-- 		</Arg> -->
-<!-- 	</Call> -->
-	
-<!-- The following commented out code is for ssl connection setup. Default setup is for the AJSC to run as http server and 
-allow other components (such as CSI Gateway) to handle the https calls to end user. Please, verify with your team and/or
-CSI/CSTEM whether or not you would need to add an ssl connector.  -->
-	<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-		<Set name="keyStorePath"><SystemProperty name="CONFIG_HOME" />/auth/tomcat_keystore</Set>
-		<Set name="keyStorePassword">
-			<Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate">
-				<Arg><SystemProperty name="KEY_STORE_PASSWORD" /></Arg>
-			</Call>
-		</Set>
-		<Set name="keyManagerPassword">
-			<Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate">
-				<Arg><SystemProperty name="KEY_MANAGER_PASSWORD" /></Arg>
-			</Call>
-		</Set>
-		<Set name="needClientAuth">true</Set>
-		<Set name="wantClientAuth">true</Set>
-	</New>
-
-	<Call id="sslConnector" name="addConnector">
-		<Arg>
-			<New class="org.eclipse.jetty.server.ServerConnector">
-				<Arg name="server">
-					<Ref refid="ajsc-server" />
-				</Arg>
-				<Arg name="factories">
-					<Array type="org.eclipse.jetty.server.ConnectionFactory">
-						<Item>
-							<New class="org.eclipse.jetty.server.SslConnectionFactory">
-								<Arg name="next">http/1.1</Arg>
-								<Arg name="sslContextFactory">
-									<Ref refid="sslContextFactory" />
-								</Arg>
-							</New>
-						</Item>
-						<Item>
-							<New class="org.eclipse.jetty.server.HttpConnectionFactory">
-								<Arg name="config">
-									<New class="org.eclipse.jetty.server.HttpConfiguration">
-										<Call name="addCustomizer">
-											<Arg>
-												<New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
-											</Arg>
-										</Call>
-									</New>
-								</Arg>
-							</New>
-						</Item>
-					</Array>
-				</Arg>
-				<Set name="port"><SystemProperty name="AJSC_HTTPS_PORT" default="0" /></Set>
-				<Set name="idleTimeout">30000</Set>
-			</New>
-		</Arg>
-	</Call>
-
-<!--	<Get name="ThreadPool">
-		<Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set>
-		<Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set>
-		<Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set>
-		<Set name="detailedDump">false</Set>
-	</Get>-->
-	
-</Configure>
\ No newline at end of file
diff --git a/src/main/config/ajsc-override-web.xml b/src/main/config/ajsc-override-web.xml
deleted file mode 100644
index 84a7920..0000000
--- a/src/main/config/ajsc-override-web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	metadata-complete="false" version="3.0">
-
-	<filter-mapping>
-		<filter-name>InterceptorFilter</filter-name>
-		<url-pattern>/services/*</url-pattern>
-	</filter-mapping> 
-	<filter-mapping>
-		<filter-name>InterceptorFilter</filter-name>
-		<url-pattern>/rest/*</url-pattern>
- 	</filter-mapping>  
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-		
-	<servlet-mapping>
-		<servlet-name>ManagementServlet</servlet-name>
-		<url-pattern>/mgmt</url-pattern>
-	</servlet-mapping>
-	 
-	 <servlet-mapping>
-			<servlet-name>RestletServlet</servlet-name>
-			<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-
- 	<servlet-mapping>
-		<servlet-name>CamelServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>jsp</servlet-name>
-		<url-pattern>*.jsp</url-pattern>
-		<url-pattern>*.jspf</url-pattern>
-		<url-pattern>*.jspx</url-pattern>
-		<url-pattern>*.xsp</url-pattern>
-		<url-pattern>*.JSP</url-pattern>
-		<url-pattern>*.JSPF</url-pattern>
-		<url-pattern>*.JSPX</url-pattern>
-		<url-pattern>*.XSP</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-</web-app>
\ No newline at end of file
diff --git a/src/main/config/ajscJetty.jks b/src/main/config/ajscJetty.jks
deleted file mode 100644
index 48cdbff..0000000
--- a/src/main/config/ajscJetty.jks
+++ /dev/null
diff --git a/src/main/config/cadi.properties b/src/main/config/cadi.properties
deleted file mode 100644
index d250fec..0000000
--- a/src/main/config/cadi.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-#This properties file is used for defining AAF properties related to the CADI framework. This file is used for running AAF framework
-
-#In order to test functionality of cadi-ajsc-plugin locally cross domain cookie. Cadi "should" find your hostname for you. 
-#However, we have seen some situations where this fails. A Local testing
-#modification can include modifying your hosts file so that you can use "mywebserver.att.com" for your localhost in order
-#to test/verify GLO functionality locally. If you are on a Windows machine, you will already have a machine name associated with 
-#it that will utilize an AT&T domain such as "sbc.com". You may need to add your  domain to this as a comma separated list depending
-#upon your particular machine domain. This property is commented out as cadi SHOULD find your machine name. With version 1.2.1 of cadi, 
-#it appears to resolve Mac machine names as well, now. But, this can be somewhat inconsistent depending on your specific working envrironment.
-hostname=mywebserver.att.com
-
-#Setting csp_domain to PROD will allow for testing using your attuid and password through GLO.
-csp_domain=PROD
-csp_devl_localhost=true
-
-basic_realm=csp.att.com
-#basic_realm=aaf.att.com
-basic_warn=TRUE
-
-cadi_loglevel=WARN
-cadi_keyfile=target/swm/package/nix/dist_files/appl/babel/etc/keyfile
-
-# Configure AAF
-#These are dummy values add appropriate values required
-aaf_url=url
-
-#AJSC - MECHID
-#These are dummy values add appropriate values required
-aaf_id=dummyid@ajsc.att.com
-aaf_password=enc:277edqJCjT0RlUI3BtbDQa-3Ha-CQGd
-aaf_timeout=5000
-aaf_clean_interval=30000
-aaf_user_expires=5000
-aaf_high_count=1000
-
-
diff --git a/src/main/config/jul-redirect.properties b/src/main/config/jul-redirect.properties
deleted file mode 100644
index 8b6624d..0000000
--- a/src/main/config/jul-redirect.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#  	Bridge JUL->slf4j Logging Configuration File
-#
-# This file bridges the JUL logging infrastructure into
-# SLF4J so JUL logs go to logback implementation provided
-# in this project.  SLF4J also captures log4j and has 
-# other framework options as well providing a common
-# logging infrastructure for capturing all logs from different
-# libraries using different frameworks in one place.
-
-#  	Global properties
-handlers=org.slf4j.bridge.SLF4JBridgeHandler
-.level= ALL
diff --git a/src/main/config/keyfile b/src/main/config/keyfile
deleted file mode 100644
index 882e86a..0000000
--- a/src/main/config/keyfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ZuIwp0TkyVPDeX1Up-8JtkMWvjsCpoiu1_VKeWrtrvxunvAke8_tiFyHPPyb2nkhepFYj6tXzpfS
-rGz5XF_TH9NbsKaP8u0HV5clz2WriYQRvHS85vjY7hXxkpFuLb7zkLAPqTyIDpj7FiW61NzsRUAq
-TM8jH16jr7mBNnb56w24mNGOwznMPcIZKcjgZU1ekaPDFpWyhQElU7Y0q_94P_Gkk45r66Hj22sU
-OiOaaftmudZlswLw8-8Zaakqf2yW9HjMVfuYCwSodBHCW5rdB3Ctb5W36rnD_AQco3Ky2PgPmqvk
-QkJYuUHpbuDqVHqLOajlKSIGMTIqAIBg51fRaaONtD-Q5xzY8E5wO1YWTLKcP5tsNvUpzM8Wu3NS
-ynpGpUcvlTqWWsGzTbzOyamyKkdNdx97sSqjM25Zh1-ps48h6cddGYWpab7SUvqRCS11QBUyLTry
-2iwTEHMhHRIbo7PO99ALQfuq9gI1zKGfurJdvLBeBaFs5SCF0AiCZ3WcDO8Rv3HpxVZ2_ShbDxb0
-eMoO6SotXu51fj8Y3-WqsfZziQyEsHyqpg5uQ6yUtz01h5YHLEoVuotF1U4agmQR6kEkYk-wNOiZ
-v-8gaA9gtbLoAdKhuKFxQgQLNMf6GzVzZNujbmDzLoZAP_mXAv29aBPaf64Ugzv-Oa5GZdBgD-Xd
-_pahML-ionw99r0TnkpShYmDqMKhMdjaP3m87WIAZkIB-L-VTyKcEsJ4340VSzCOsv3waiM0S89u
-4cMcG5y-PLY8IoipIlLUPTWD3SjcQ9DV1Dt3T5KjdWLsj48D3W4K4e9PB8yxs0gtUjgVUR2_xEir
-G5eDO9Ac1eHFWGDFFP0SgG-TbHJUKlvy9mwLzmU0fC3xPjhqmIr-v0HxF7HN-tmb1LHDorno8tSN
-u7kUGcKSchIiFfvkd066crUb2mH7PnXTaWmAjyVj9VsBExFUYEdpHMAV4sAP9-RxZGDRt46UhrDK
-QZvvNhBVyOEjHPHWI4vl1r1v8HNH1_2jZu5DVJWyHWR56aCo1lhFH9_X6UAHUHbnXViDONZOVXlT
-9-WD0tk2zJGuwrhdZDAnPnAmjfwbwbpnr5Hmex1i1JiD7WVyP1kbfoej2TmdiYbxr9oBYaGQ29JI
-aHod7MQCLtvL1z5XgnDPLZ4y3_9SbqHKYbNa8UgZkTLF5EacGThYVFDLA9cbafHDtR1kMGE3vv4D
-EJ-0pAYTOGmKlVI7DwNyKsY9JTyudrxTqhOxi9jgcJNWiUaNe9yhL8Pyc2YBqUTTYhh_a2d1rvkZ
-0Gh1crviVxqBrIkRKaMRXZ4f1vDLz-3NvG_vwPOo8WRFo5nGmSdTw7CjBaigJ_cYCfDhoP11pEnw
-cndsZNcHs-v05LlxeIIMDD_f5Bvz-il_DLA4eK2HqgLdxh8ziSDl2azk14MJY4amzz6reEXUuKLV
-RsZGf_jbDGKhE2HuDQ5ovoLOi4OqE1oRuqh-dGxitrYouP2SN1l_1tCEMRth86FMV-6AQtZsvdUo
-y9MtQ7e35atjA8nHtgADlDTmJBKQiUHUsOZ77p1qp17HAFMovUkc739opfEYnKUn6Itpw5Ipm_Is
-ra6chJUfMpOFof5rb5OjqFAN27c_-mPo1lQU3ndYlKGh_n5V8ufX6v2Yri8WzOPf6hjVYotkmoMP
-NPAICDCB8W5ddBjsopzLVVEtaXDu9Qj6-zf77hT4iQ7rBd2Ner8iLqN3Kis0dvkNM3_uH8onau1G
-Y_YYw7PPSZyd2S_7Dd6G-IG4ayO6e5DD6oUwwekyiQI_3rTXNa_wldGxqW9u818010ekE4Qdlfcj
-beIn7fAeaOjReZ87hRgWyMs-EgTVHw8RL3yI_O6VvRTVRONRF1Y4C_-IYa8z-bfrwXx3BBd9TTgb
-EnS9wVOyC2OgUN6BhPLGLhxzkJ05nEjizXEc9t5EPYoSRwesajGGrrG_0-qWbuU5hKLPLkyeJLHb
-5HXOTVsrUR59Vov2M3_EswkxcImblox3k3VS2yihZMGyfqLzZIUXgd8ufkevKKU6DxwacGTb
\ No newline at end of file
diff --git a/src/main/config/runner-web.xml b/src/main/config/runner-web.xml
deleted file mode 100644
index b51aff4..0000000
--- a/src/main/config/runner-web.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	metadata-complete="false" version="3.0">
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring-servlet.xml,
-					classpath:applicationContext.xml
-		</param-value>
-  	</context-param>
-  	
-  	<context-param>
-        <param-name>spring.profiles.default</param-name>
-        <param-value>nooauth</param-value>
-    </context-param>
-    
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	
-	<servlet>
-		<servlet-name>ManagementServlet</servlet-name>
-		<servlet-class>ajsc.ManagementServlet</servlet-class>
-	</servlet>
-
-    
-  	<filter> 
-		<filter-name>InterceptorFilter</filter-name>
-		<filter-class>ajsc.filters.InterceptorFilter</filter-class>
-		<init-param>
-                <param-name>preProcessor_interceptor_config_file</param-name>
-                <param-value>/etc/PreProcessorInterceptors.properties</param-value>
-        </init-param>
-        <init-param>
-                <param-name>postProcessor_interceptor_config_file</param-name>
-                <param-value>/etc/PostProcessorInterceptors.properties</param-value>
-        </init-param>
-        
-	</filter>
-
-	 <servlet>
-		<servlet-name>RestletServlet</servlet-name>
-		<servlet-class>ajsc.restlet.RestletSpringServlet</servlet-class>
-		<init-param>
-				<param-name>org.restlet.component</param-name>
-				<param-value>restletComponent</param-value>
-		</init-param>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>CamelServlet</servlet-name>
-		<servlet-class>ajsc.servlet.AjscCamelServlet</servlet-class>
-	</servlet>
-
-
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<servlet>
-		<servlet-name>spring</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>	
-	
-<!--	<servlet-mapping>
-		<servlet-name>spring</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>-->
-
-<!-- BEGIN jsp -->
-
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-  </servlet>
-
-	
-	
-
-	  
-	<!-- BEGIN static content -->
-	<servlet>
- 	   <servlet-name>default</servlet-name>
-	    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
-	    <init-param>
-	        <param-name>dirAllowed</param-name>
-	        <param-value>true</param-value>
-	    </init-param>
-	</servlet>
-	<!-- END static content --> 	
-</web-app>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 362814d..bd5d445 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:14.04
 
 ARG MICRO_HOME=/opt/app/babel
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG JAR_FILE=babel.jar
 
 RUN apt-get update
 
@@ -10,15 +11,22 @@ RUN apt-get update && apt-get install -y software-properties-common
 ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
 RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
 ## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-ADD swm/package/nix/dist_files/appl/babel/* $MICRO_HOME/
+COPY ${JAR_FILE} $MICRO_HOME
 RUN mkdir -p $BIN_HOME
 COPY *.sh $BIN_HOME
 RUN chmod 755 $BIN_HOME/*
 RUN ln -s /logs $MICRO_HOME/logs
 
-CMD ["/opt/app/babel/bin/start.sh"]
+# Create the aai user
+RUN mkdir /opt/aaihome && \
+    groupadd -g 492381 aaiadmin && \
+    useradd -r -u 341790 -g 492381 -ms /bin/bash -d /opt/aaihome/aaiadmin aaiadmin && \
+    chown -R aaiadmin:aaiadmin $MICRO_HOME
+USER aaiadmin
+
+CMD ["/opt/app/babel/bin/start.sh"]
\ No newline at end of file
diff --git a/src/main/java/org/onap/aai/auth/AAIAuthException.java b/src/main/java/org/onap/aai/auth/AAIAuthException.java
index a29ee98..641dd4e 100644
--- a/src/main/java/org/onap/aai/auth/AAIAuthException.java
+++ b/src/main/java/org/onap/aai/auth/AAIAuthException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
index e4367f1..67eee9a 100644
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuth.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
index 6f000b8..648d9d0 100644
--- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
+++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -46,7 +46,7 @@ public class AAIMicroServiceAuthCore {
     public static final String FILESEP =
             (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
     public static final String APPCONFIG_DIR = (System.getProperty("CONFIG_HOME") == null)
-            ? System.getProperty("AJSC_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
+            ? System.getProperty("APP_HOME") + FILESEP + "appconfig" : System.getProperty("CONFIG_HOME");
 
     private static String appConfigAuthDir = APPCONFIG_DIR + FILESEP + "auth";
     private static String defaultAuthFileName = appConfigAuthDir + FILESEP + "auth_policy.json";
@@ -85,7 +85,7 @@ public class AAIMicroServiceAuthCore {
             throw new AAIAuthException(e.getMessage());
         }
         if (policyAuthFileName == null) {
-            throw new AAIAuthException("Auth policy file could not be found");
+            throw new AAIAuthException("Auth policy file could not be found" + System.getProperty("CONFIG_HOME") + APPCONFIG_DIR);
         }
         AAIMicroServiceAuthCore.reloadUsers();
 
diff --git a/src/main/java/org/onap/aai/auth/FileWatcher.java b/src/main/java/org/onap/aai/auth/FileWatcher.java
index d974e66..57afc71 100644
--- a/src/main/java/org/onap/aai/auth/FileWatcher.java
+++ b/src/main/java/org/onap/aai/auth/FileWatcher.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/BabelApplication.java b/src/main/java/org/onap/aai/babel/BabelApplication.java
new file mode 100644
index 0000000..cc3ca4b
--- /dev/null
+++ b/src/main/java/org/onap/aai/babel/BabelApplication.java
@@ -0,0 +1,49 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.babel;
+
+import java.util.HashMap;
+import org.eclipse.jetty.util.security.Password;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.ImportResource;
+
+@SpringBootApplication
+@ImportResource("classpath:babel-beans.xml")
+public class BabelApplication extends SpringBootServletInitializer {
+
+    /**
+     * Spring Boot Initialization.
+     * 
+     * @param args main args
+     */
+    public static void main(String[] args) {
+        String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");
+        if (keyStorePassword == null || keyStorePassword.isEmpty()) {
+            throw new IllegalArgumentException("Env property KEY_STORE_PASSWORD not set");
+        }
+        HashMap<String, Object> props = new HashMap<>();
+        props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));
+        new BabelApplication().configure(new SpringApplicationBuilder(BabelApplication.class).properties(props))
+                .run(args);
+    }
+}
diff --git a/src/main/java/org/onap/aai/babel/JerseyConfiguration.java b/src/main/java/org/onap/aai/babel/JerseyConfiguration.java
new file mode 100644
index 0000000..a963774
--- /dev/null
+++ b/src/main/java/org/onap/aai/babel/JerseyConfiguration.java
@@ -0,0 +1,38 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.babel;
+
+import javax.ws.rs.ApplicationPath;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.onap.aai.babel.service.GenerateArtifactsServiceImpl;
+import org.onap.aai.babel.service.InfoService;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ApplicationPath("/v1")
+public class JerseyConfiguration extends ResourceConfig {
+
+    public JerseyConfiguration() {
+        register(GenerateArtifactsServiceImpl.class);
+        register(InfoService.class);
+    }
+
+}
diff --git a/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java b/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
index 21525a1..44b9882 100644
--- a/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
+++ b/src/main/java/org/onap/aai/babel/config/BabelAuthConfig.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java b/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
index eb81014..03c485e 100644
--- a/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
+++ b/src/main/java/org/onap/aai/babel/csar/CsarConverterException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java b/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
index 1322c9c..be6ef58 100644
--- a/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
+++ b/src/main/java/org/onap/aai/babel/csar/CsarToXmlConverter.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -22,7 +22,8 @@ package org.onap.aai.babel.csar;
 
 import java.util.List;
 import java.util.Objects;
-import org.apache.commons.lang.time.StopWatch;
+
+import org.apache.commons.lang3.time.StopWatch;
 import org.onap.aai.babel.csar.extractor.InvalidArchiveException;
 import org.onap.aai.babel.csar.extractor.YamlExtractor;
 import org.onap.aai.babel.logging.ApplicationMsgs;
@@ -45,7 +46,7 @@ public class CsarToXmlConverter {
      * @param csarArchive the artifact that contains the csar archive to generate xml artifacts from
      * @param name the name of the archive file
      * @param version the version of the archive file
-     * @return List<org.openecomp.sdc.generator.data.Artifact> a list of generated xml artifacts
+     * @return List<org.onap.sdc.generator.data.Artifact> a list of generated xml artifacts
      * @throws CsarConverterException if there is an error either extracting the yaml files or generating xml artifacts
      */
     public List<BabelArtifact> generateXmlFromCsar(byte[] csarArchive, String name, String version)
diff --git a/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java b/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
index 97d72d4..4b63371 100644
--- a/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
+++ b/src/main/java/org/onap/aai/babel/csar/extractor/InvalidArchiveException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java b/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
index 7700a54..73d364e 100644
--- a/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/extractor/YamlExtractor.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
index 983c810..c6a81d8 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ConfigurationsToBabelArtifactConverter.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
index 425982b..5ba1aba 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/InvalidNumberOfNodesException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
index 2ef9dc8..edf7771 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/ToscaToCatalogException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
index bd9aac7..2d419e2 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VendorImageConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
index e76c0c1..9836e2a 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -30,8 +30,9 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.aai.babel.logging.ApplicationMsgs;
diff --git a/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java b/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
index 84b426b..0113aa5 100644
--- a/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
+++ b/src/main/java/org/onap/aai/babel/logging/ApplicationMsgs.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/logging/LogHelper.java b/src/main/java/org/onap/aai/babel/logging/LogHelper.java
index 54c5361..2e54be7 100644
--- a/src/main/java/org/onap/aai/babel/logging/LogHelper.java
+++ b/src/main/java/org/onap/aai/babel/logging/LogHelper.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -37,7 +37,7 @@ import java.util.function.Consumer;
 import javax.servlet.ServletRequest;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response.Status;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.onap.aai.babel.request.RequestHeaders;
 import org.onap.aai.cl.api.LogFields;
 import org.onap.aai.cl.api.Logger;
diff --git a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
index 3bccebe..70e78ec 100644
--- a/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
+++ b/src/main/java/org/onap/aai/babel/parser/ArtifactGeneratorToscaParser.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
+
 import org.onap.aai.babel.logging.LogHelper;
 import org.onap.aai.babel.xml.generator.data.GeneratorConstants;
 import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
@@ -64,7 +65,7 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Constructs using csarHelper
-     * 
+     *
      * @param csarHelper The csar helper
      */
     public ArtifactGeneratorToscaParser(ISdcCsarHelper csarHelper) {
@@ -73,7 +74,7 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Returns the artifact description
-     * 
+     *
      * @param model the artifact model
      * @return the artifact model's description
      */
@@ -89,7 +90,7 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Initialises the widget configuration.
-     * 
+     *
      * @throws IOException
      */
     public static void initWidgetConfiguration() throws IOException {
@@ -111,7 +112,7 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Generates a Resource List using input Service Node Templates
-     * 
+     *
      * @param serviceNodes input Service Node Templates
      * @param idTypeStore ID->Type mapping
      * @return the processed resource models
@@ -213,11 +214,11 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Process the service tosca
-     * 
+     *
      * @param service model of the service artifact
      * @param idTypeStore ID->Type mapping
      * @param nodeTemplates a list of service nodes
-     * 
+     *
      */
     public void processServiceTosca(Service service, Map<String, String> idTypeStore,
             List<NodeTemplate> nodeTemplates) {
@@ -262,7 +263,7 @@ public class ArtifactGeneratorToscaParser {
 
     /**
      * Create a Map of property name against String property value from the input Map
-     * 
+     *
      * @param inputMap The input Map
      * @return Map of property name against String property value
      */
diff --git a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
index f0d960c..0d1dbdc 100644
--- a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
+++ b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
index 7034149..33f6f1a 100644
--- a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
+++ b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsService.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -33,7 +33,7 @@ import javax.ws.rs.core.UriInfo;
 import org.onap.aai.auth.AAIAuthException;
 
 /** Generate artifacts from the specified request content */
-@Path("/")
+@Path("/app")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 public interface GenerateArtifactsService {
diff --git a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
index eef7476..17d0b65 100644
--- a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
+++ b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -20,9 +20,9 @@
  */
 package org.onap.aai.babel.service;
 
-import com.att.aft.dme2.internal.gson.Gson;
-import com.att.aft.dme2.internal.gson.GsonBuilder;
-import com.att.aft.dme2.internal.gson.JsonSyntaxException;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
 import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
@@ -33,7 +33,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.onap.aai.auth.AAIMicroServiceAuth;
 import org.onap.aai.auth.AAIMicroServiceAuthCore;
 import org.onap.aai.babel.csar.CsarConverterException;
@@ -56,9 +56,7 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService {
 
     private AAIMicroServiceAuth aaiMicroServiceAuth;
 
-    /**
-     * @param authorization
-     */
+    /** @param authorization */
     @Inject
     public GenerateArtifactsServiceImpl(final AAIMicroServiceAuth authorization) {
         this.aaiMicroServiceAuth = authorization;
diff --git a/src/main/java/org/onap/aai/babel/service/InfoService.java b/src/main/java/org/onap/aai/babel/service/InfoService.java
index 107c6d1..c993746 100644
--- a/src/main/java/org/onap/aai/babel/service/InfoService.java
+++ b/src/main/java/org/onap/aai/babel/service/InfoService.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -37,7 +37,7 @@ import javax.ws.rs.QueryParam;
  *
  * @exclude
  */
-@Path("/core-service")
+@Path("/core/core-service")
 public class InfoService {
 
     private Clock clock = Clock.systemDefaultZone();
diff --git a/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java b/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
index 81c237e..3aa9f8c 100644
--- a/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
+++ b/src/main/java/org/onap/aai/babel/service/data/BabelArtifact.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java b/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
index 47241b4..9c73277 100644
--- a/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
+++ b/src/main/java/org/onap/aai/babel/service/data/BabelRequest.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/util/RequestValidationException.java b/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
index cf5322a..ce19ed1 100644
--- a/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
+++ b/src/main/java/org/onap/aai/babel/util/RequestValidationException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/util/RequestValidator.java b/src/main/java/org/onap/aai/babel/util/RequestValidator.java
index 499a5c8..c0d2c98 100644
--- a/src/main/java/org/onap/aai/babel/util/RequestValidator.java
+++ b/src/main/java/org/onap/aai/babel/util/RequestValidator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
index 46d5ea4..3d07a7a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/ArtifactGenerator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
index 65e0ada..dcd0f3e 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/ModelGenerator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java b/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
index 5e5304b..940de43 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/XmlArtifactGenerationException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
index bdcd71c..c6ca460 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiArtifactGenerator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -26,6 +26,7 @@ import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.commons.io.FileUtils;
 import org.onap.aai.babel.logging.ApplicationMsgs;
 import org.onap.aai.babel.logging.LogHelper;
@@ -132,7 +133,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
 
     /**
      * Method to generate the artifact label for AAI model
-     * 
+     *
      * @param model
      * @return the artifact label as String
      */
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
index f8571f3..409dbc2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
index 488faae..156a8b6 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGeneratorImpl.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
index b5c8f5b..0dc64bf 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/ArtifactGenerator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java b/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
index 00b276c..ee52868 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/AdditionalParams.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java b/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
index 50dfc89..690305f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/Artifact.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java b/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
index 572342a..27f3b23 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/ArtifactType.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
index f59cb66..d73d56d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GenerationData.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
index 40e8eb9..b9d8cb2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorConstants.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
index 905c859..2405d4d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GeneratorUtil.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java b/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
index b2bc3f9..caeed0e 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/GroupType.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
index d36982d..e3a0f2c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java b/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
index 3c907cb..491e2c5 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/error/IllegalAccessException.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java b/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
index b6ca2d3..424db94 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/logging/CategoryLogLevel.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
index cecf7bd..c22228f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResource.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
index 740ca62..59e7b4f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/AllotedResourceWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
index 26dde9b..0d6302c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/FlavorWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
index 60656b2..269ea25 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ImageWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java b/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
index 105c3a1..bc6ece2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/L3Network.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
index f737b82..87edd65 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/L3NetworkWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
index fb07ef6..98bac09 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/LIntfWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
index 262d29a..0a8f0b1 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Model.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java b/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
index e9076a9..35c893d 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/OamNetwork.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
index e25274e..8e3f3e0 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ProvidingService.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
index 9d4feab..2dfe2fb 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Resource.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
index a0f84c7..c537343 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ResourceWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
index 9d22e41..7469c38 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Service.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
index 7c2229d..d3088a7 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/ServiceWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
index a0a4392..473a80a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/TenantWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
index 548cd6f..9f1857f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/TunnelXconnectWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
index 7de0f5b..86f255f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VServerWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
index 8b8913d..43915b2 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModule.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
index cc27ca9..3cee38c 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfModuleWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
index 614244e..6a6d431 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
index abfa49f..07172fe 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VfcWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
index be75d65..aa7ef06 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VirtualFunction.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
index 3a0aa37..2649c06 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeGroupWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
index d18a723..0aa9658 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/VolumeWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java b/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
index 545ad79..2a85e27 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/model/Widget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java b/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
index 9cdb93b..11b7e15 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/Cardinality.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java b/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
index f69c3ea..69dae3f 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/Model.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
index 7dd86c6..e92af8a 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelType.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
index 307524e..ed52ace 100644
--- a/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/types/ModelWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..2cb4fe8
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+server.port=9516
+server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore
+server.ssl.client-auth=need
+
+server.contextPath=/services/babel-service
+
+logging.config=${CONFIG_HOME}/logback.xml
\ No newline at end of file
diff --git a/src/main/ajsc/babel_v1/babel/v1/conf/babel-beans.xml b/src/main/resources/babel-beans.xml
index f4cc32c..f4cc32c 100644
--- a/src/main/ajsc/babel_v1/babel/v1/conf/babel-beans.xml
+++ b/src/main/resources/babel-beans.xml
diff --git a/src/main/resources/babel-logging-resources.properties b/src/main/resources/babel-logging-resources.properties
index dba72c8..99b2294 100644
--- a/src/main/resources/babel-logging-resources.properties
+++ b/src/main/resources/babel-logging-resources.properties
@@ -1,23 +1,21 @@
-###
 # ============LICENSE_START=======================================================
-# MODEL LOADER SERVICE
+# org.onap.aai
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# Copyright (C) 2017 European Software Marketing Ltd.
+# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017-2018 European Software Marketing Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-###
 
 #Resource key=Error Code|Message text|Resolution text |Description text
 #######
diff --git a/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context b/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context
deleted file mode 100644
index 8514196..0000000
--- a/src/main/runtime/context/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.context
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"__module_ajsc_namespace_name__:__module_ajsc_namespace_version__","contextName":"__module_ajsc_namespace_name__","contextVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ Context"}}
\ No newline at end of file
diff --git a/src/main/runtime/context/default#0.context b/src/main/runtime/context/default#0.context
deleted file mode 100644
index d1b5ab4..0000000
--- a/src/main/runtime/context/default#0.context
+++ /dev/null
@@ -1 +0,0 @@
-{"context":{"contextClass":"ajsc.Context","contextId":"default:0","contextName":"default","contextVersion":"0","description":"Default Context"}}
\ No newline at end of file
diff --git a/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json b/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json
deleted file mode 100644
index d0954cf..0000000
--- a/src/main/runtime/deploymentPackage/__module.ajsc.namespace.name__#__module.ajsc.namespace.version__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"deploymentPackage":{"Class":"ajsc.DeploymentPackage","Id":"__module.ajsc.namespace.name__:__module_ajsc_namespace_version__","namespace":"__module_ajsc_namespace_name__","namespaceVersion":"__module_ajsc_namespace_version__","description":"__module_ajsc_namespace_name__ __module_ajsc_namespace_version__ - default description","userId":"ajsc"}}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/ajscadmin.json b/src/main/runtime/shiroRole/ajscadmin.json
deleted file mode 100644
index f5e981e..0000000
--- a/src/main/runtime/shiroRole/ajscadmin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"ajscadmin","name":"ajscadmin","permissions":"[ajscadmin:*, ajsc:*]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json b/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644
index 2dae9f5..0000000
--- a/src/main/runtime/shiroRole/contextadmin#__module.ajsc.namespace.name__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:__module_ajsc_namespace_name__","name":"contextadmin:__module_ajsc_namespace_name__","permissions":"[]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroRole/contextadmin#default.json b/src/main/runtime/shiroRole/contextadmin#default.json
deleted file mode 100644
index 5de814e..0000000
--- a/src/main/runtime/shiroRole/contextadmin#default.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroRoleClass":"ajsc.auth.ShiroRole","shiroRoleId":"contextadmin:default","name":"contextadmin:default","permissions":"[]"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUser/ajsc.json b/src/main/runtime/shiroUser/ajsc.json
deleted file mode 100644
index f4c7855..0000000
--- a/src/main/runtime/shiroUser/ajsc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserClass":"ajsc.auth.ShiroUser","shiroUserId":"ajsc","passwordHash":"9471697417008c880720ba54c6038791ad7e98f3b88136fe34f4d31a462dd27a","permissions":"[*:*]","username":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json b/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json
deleted file mode 100644
index cb8d483..0000000
--- a/src/main/runtime/shiroUserRole/ajsc#ajscadmin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:ajscadmin","roleId":"ajscadmin","userId":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json b/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json
deleted file mode 100644
index 95d2361..0000000
--- a/src/main/runtime/shiroUserRole/ajsc#contextadmin#__module.ajsc.namespace.name__.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:__module_ajsc_namespace_name__","roleId":"contextadmin:__module_ajsc_namespace_name__","userId":"ajsc"}
\ No newline at end of file
diff --git a/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json b/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json
deleted file mode 100644
index 2bd5063..0000000
--- a/src/main/runtime/shiroUserRole/ajsc#contextadmin#default.json
+++ /dev/null
@@ -1 +0,0 @@
-{"shiroUserRoleClass":"ajsc.auth.ShiroUserRole","shiroUserRoleId":"ajsc:contextadmin:default","roleId":"contextadmin:default","userId":"ajsc"}
\ No newline at end of file
diff --git a/src/test/java/org/onap/aai/babel/MicroServiceAuthTest.java b/src/test/java/org/onap/aai/babel/MicroServiceAuthTest.java
index 6912d90..99eb4e9 100644
--- a/src/test/java/org/onap/aai/babel/MicroServiceAuthTest.java
+++ b/src/test/java/org/onap/aai/babel/MicroServiceAuthTest.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java b/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
index 9024efa..77517ad 100644
--- a/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
+++ b/src/test/java/org/onap/aai/babel/csar/extractor/YamlExtractorTest.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/test/java/org/onap/aai/babel/csar/fixture/ArtifactInfoBuilder.java b/src/test/java/org/onap/aai/babel/csar/fixture/ArtifactInfoBuilder.java
index 20c8254..96f1b2d 100644
--- a/src/test/java/org/onap/aai/babel/csar/fixture/ArtifactInfoBuilder.java
+++ b/src/test/java/org/onap/aai/babel/csar/fixture/ArtifactInfoBuilder.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -22,7 +22,7 @@ package org.onap.aai.babel.csar.fixture;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
 
 /**
  * This class builds an instance of IArtifactInfo for test purposes.
diff --git a/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java b/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
index dfca951..f686911 100644
--- a/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
+++ b/src/test/java/org/onap/aai/babel/csar/fixture/TestArtifactInfoImpl.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -22,7 +22,7 @@ package org.onap.aai.babel.csar.fixture;
 
 import java.util.Objects;
 import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
 
 /**
  * This class is an implementation of IArtifactInfo for test purposes.
diff --git a/src/test/java/org/onap/aai/babel/logging/LogReader.java b/src/test/java/org/onap/aai/babel/logging/LogReader.java
index c2a8e64..0c4de64 100644
--- a/src/test/java/org/onap/aai/babel/logging/LogReader.java
+++ b/src/test/java/org/onap/aai/babel/logging/LogReader.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -31,7 +31,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.junit.Assert;
 
 public class LogReader {
diff --git a/src/test/java/org/onap/aai/babel/logging/TestApplicationLogger.java b/src/test/java/org/onap/aai/babel/logging/TestApplicationLogger.java
index 8a038b2..ed9dac4 100644
--- a/src/test/java/org/onap/aai/babel/logging/TestApplicationLogger.java
+++ b/src/test/java/org/onap/aai/babel/logging/TestApplicationLogger.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -28,7 +28,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import java.io.IOException;
 import java.util.Arrays;
 import javax.ws.rs.core.HttpHeaders;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -47,7 +47,7 @@ public class TestApplicationLogger {
 
     @BeforeClass
     public static void setupClass() {
-        System.setProperty("AJSC_HOME", ".");
+        System.setProperty("APP_HOME", ".");
     }
 
     /**
diff --git a/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java b/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
index b1f2c01..14fa9f3 100644
--- a/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
+++ b/src/test/java/org/onap/aai/babel/parser/TestToscaParser.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -50,8 +50,8 @@ import org.onap.aai.babel.xml.generator.data.WidgetConfigurationUtil;
 public class TestToscaParser {
 
     static {
-        if (System.getProperty("AJSC_HOME") == null) {
-            System.setProperty("AJSC_HOME", ".");
+        if (System.getProperty("APP_HOME") == null) {
+            System.setProperty("APP_HOME", ".");
         }
     }
 
diff --git a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
index c8080e9..9310d2d 100644
--- a/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
+++ b/src/test/java/org/onap/aai/babel/service/CsarToXmlConverterTest.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -57,8 +57,8 @@ public class CsarToXmlConverterTest {
     private CsarToXmlConverter converter;
 
     static {
-        if (System.getProperty("AJSC_HOME") == null) {
-            System.setProperty("AJSC_HOME", ".");
+        if (System.getProperty("APP_HOME") == null) {
+            System.setProperty("APP_HOME", ".");
         }
     }
 
diff --git a/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java b/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java
index b1423b7..5840cd7 100644
--- a/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java
+++ b/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -59,9 +59,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 public class TestGenerateArtifactsServiceImpl {
 
     static {
-        if (System.getProperty("AJSC_HOME") == null) {
-            System.setProperty("AJSC_HOME", ".");
+        if (System.getProperty("APP_HOME") == null) {
+            System.setProperty("APP_HOME", ".");
         }
+        System.setProperty("CONFIG_HOME", "src/test/resources");
     }
 
     @Inject
diff --git a/src/test/java/org/onap/aai/babel/service/TestInfoService.java b/src/test/java/org/onap/aai/babel/service/TestInfoService.java
index b97aa92..1d60839 100644
--- a/src/test/java/org/onap/aai/babel/service/TestInfoService.java
+++ b/src/test/java/org/onap/aai/babel/service/TestInfoService.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java b/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
index 5a4224c..69d7819 100644
--- a/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
+++ b/src/test/java/org/onap/aai/babel/util/ArtifactTestUtils.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -79,7 +79,7 @@ public class ArtifactTestUtils {
     }
 
     public String loadResourceAsString(String resourceName) throws IOException {
-        return IOUtils.toString(getResource(resourceName));
+        return IOUtils.toString(getResource(resourceName), Charset.defaultCharset());
     }
 
     private void compareXMLPayloads(List<Artifact> toscaFiles, Set<String> ymlPayloads) {
diff --git a/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java b/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
index bffe419..aff27cc 100644
--- a/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
+++ b/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
index d02b817..b4ce96d 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestVfModule.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -42,8 +42,8 @@ import org.onap.aai.babel.xml.generator.model.Widget.Type;
 public class TestVfModule {
 
     static {
-        if (System.getProperty("AJSC_HOME") == null) {
-            System.setProperty("AJSC_HOME", ".");
+        if (System.getProperty("APP_HOME") == null) {
+            System.setProperty("APP_HOME", ".");
         }
     }
 
diff --git a/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java b/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
index e33de67..6f2dcca 100644
--- a/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
+++ b/src/test/java/org/onap/aai/babel/xml/generator/model/TestWidget.java
@@ -1,5 +1,5 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -29,8 +29,8 @@ import org.onap.aai.babel.xml.generator.model.Widget.Type;
 public class TestWidget {
 
     static {
-        if (System.getProperty("AJSC_HOME") == null) {
-            System.setProperty("AJSC_HOME", ".");
+        if (System.getProperty("APP_HOME") == null) {
+            System.setProperty("APP_HOME", ".");
         }
     }
 
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 4f51317..376eb79 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="30 seconds" debug="true">
 	<property name="componentName" value="AAI-BAS" />
-	<property name="logDirectory" value="${AJSC_HOME}/logs/${componentName}" />
+	<property name="logDirectory" value="./logs/${componentName}" />
 
 	<!-- default EELF log file names -->
 	<property name="generalLogName" value="error" />
diff --git a/src/test/resources/babel-beans.xml b/src/test/resources/test-babel-beans.xml
index f102337..f102337 100644
--- a/src/test/resources/babel-beans.xml
+++ b/src/test/resources/test-babel-beans.xml